diff --git a/CMakeLists.txt b/CMakeLists.txt
index cee5899a2cb2dbb5d47e18d4af0276acec7e3f58..941c894750479d0e3128c1c7554eca530d667ac3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,7 +247,7 @@ set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_STATIC=${ENABLE_STATIC} -DE
 set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_TRACE=${ENABLE_TRACE} -DENABLE_BACKTRACE=${ENABLE_BACKTRACE}")
 set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_CLIENT=${ENABLE_CLIENT}")
 
-set(TARANTOOL_BUILD "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR} <${CMAKE_BUILD_TYPE}>")
+set(TARANTOOL_BUILD "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE}")
 
 #
 # Output compile-time defines into config.h. Do it at the end
@@ -263,7 +263,7 @@ configure_file(
     )
 
 message (STATUS "")
-message (STATUS "Tarantool configuration:")
+message (STATUS "Tarantool configuration is complete:")
 message (STATUS "")
 message (STATUS "VERSION: ${TARANTOOL_VERSION}")
 message (STATUS "BUILD: ${TARANTOOL_BUILD}")
@@ -276,6 +276,6 @@ message (STATUS "ENABLE_TRACE: ${ENABLE_TRACE}")
 message (STATUS "ENABLE_BACKTRACE: ${ENABLE_BACKTRACE} (symbol resolve: ${HAVE_BFD})")
 message (STATUS "ENABLE_CLIENT: ${ENABLE_CLIENT}")
 message (STATUS "")
-message (STATUS "(Please check out CMakeCache.txt to view or modify configuration results)")
+message (STATUS "To view or modify configuration results, check out CMakeCache.txt.")
 message (STATUS "")
 
diff --git a/core/tarantool.m b/core/tarantool.m
index fb5700cc55baf71b80182fd7f976503a338a063d..cb7e859c308f25a67d40d26c54cb9bc272134267 100644
--- a/core/tarantool.m
+++ b/core/tarantool.m
@@ -450,7 +450,7 @@ main(int argc, char **argv)
 	if (gopt(opt, 'V')) {
 		printf("Tarantool/%s %s\n", mod_name, tarantool_version());
 		printf("Target: %s\n", BUILD_INFO);
-		printf("Build with: %s\n", BUILD_WITH);
+		printf("Build options: %s\n", BUILD_OPTIONS);
 		printf("CFLAGS:%s\n", BUILD_CFLAGS);
 		return 0;
 	}
diff --git a/include/config.h.cmake b/include/config.h.cmake
index e3d10bb5f45393cacf3d921c9e9394258a06d6af..62fd1545e74c1f2d6a3ac4acc2d7edb28c855e6e 100644
--- a/include/config.h.cmake
+++ b/include/config.h.cmake
@@ -55,7 +55,7 @@
 #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
 #define BUILD_INFO "@TARANTOOL_BUILD@"
 #define BUILD_CFLAGS "@CMAKE_C_FLAGS@ @core_cflags@"
-#define BUILD_WITH "cmake . @TARANTOOL_OPTIONS@"
+#define BUILD_OPTIONS "cmake . @TARANTOOL_OPTIONS@"
 /*
  * vim: syntax=c
  */
diff --git a/test/box/args.result b/test/box/args.result
index 49b40e1a28636d57073a34bc932e1fb909d79d05..ec0dfb72bdac81f8c26e29abc42af67fd4ceeb1b 100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@ -76,13 +76,13 @@ tarantool_box: --background requires 'logger' configuration option to be set
 tarantool_box --version
 Tarantool/Box 1.minor.patch-<rev>-<commit>
 Target: platform <build>
-Build with: flags
+Build options: flags
 CFLAGS: flags
 
 tarantool_box -V
 Tarantool/Box 1.minor.patch-<rev>-<commit>
 Target: platform <build>
-Build with: flags
+Build options: flags
 CFLAGS: flags
 
 #
diff --git a/test/box/args.test b/test/box/args.test
index 3647ac59bb0d0598719c88d4d4a7b018ab0888f4..9246754d2a4667b57d92ad70383dfb075f4d9a62 100644
--- a/test/box/args.test
+++ b/test/box/args.test
@@ -28,7 +28,7 @@ os.unlink(cfg)
 sys.stdout.pop_filter()
 sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?", "\\1.minor.patch-<rev>-<commit>")
 sys.stdout.push_filter("Target: .*", "Target: platform <build>")
-sys.stdout.push_filter("Build with: .*", "Build with: flags")
+sys.stdout.push_filter("Build options: .*", "Build options: flags")
 sys.stdout.push_filter("CFLAGS: .*", "CFLAGS: flags")
 
 server.test_option("--version")
diff --git a/test/lib/server.py b/test/lib/server.py
index 95b68ea47fecc1447d7eb68fb9a167f724211f4a..ae5deb3b54ade14e267cec78ee1f8902226fd924 100644
--- a/test/lib/server.py
+++ b/test/lib/server.py
@@ -266,7 +266,7 @@ class Server(object):
 
     def test_debug(self):
         output = self.test_option_get(False, "-V")
-	if re.search("<Debug>", output):
+	if re.search("-Debug", output):
            return True
         return False