diff -Naur ncbi-blast-2.5.0+-src.old/c++/src/corelib/teamcity_boost.cpp ncbi-blast-2.5.0+-src/c++/src/corelib/teamcity_boost.cpp
--- ncbi-blast-2.5.0+-src.old/c++/src/corelib/teamcity_boost.cpp	2017-09-12 17:21:18.878837189 +0100
+++ ncbi-blast-2.5.0+-src/c++/src/corelib/teamcity_boost.cpp	2017-09-12 17:21:57.891817981 +0100
@@ -91,7 +91,7 @@
         if (underTeamcity()) {
             boost::unit_test::unit_test_log.set_formatter(new TeamcityBoostLogFormatter());
             boost::unit_test::unit_test_log.set_threshold_level
-                (RTCFG(but::log_level, LOG_LEVEL, log_level));
+                (RTCFG(but::log_level, LOG_LEVEL));
         }
     }
 };
diff -Naur ncbi-blast-2.5.0+-src.old/c++/src/corelib/test_boost.cpp ncbi-blast-2.5.0+-src/c++/src/corelib/test_boost.cpp
--- ncbi-blast-2.5.0+-src.old/c++/src/corelib/test_boost.cpp	2017-09-12 17:21:18.878837189 +0100
+++ ncbi-blast-2.5.0+-src/c++/src/corelib/test_boost.cpp	2017-09-12 17:32:25.207604140 +0100
@@ -93,12 +93,31 @@
 #  define IGNORE_STATUS
 #endif
 
+#if BOOST_VERSION >= 106400
+#  define LIST_CONTENT      btrt_list_content
+#  define LIST_LABELS       btrt_list_labels
+#  define LOG_FORMAT        btrt_log_format
+#  define LOG_LEVEL         btrt_log_level
+#  define REPORT_FORMAT     btrt_report_format
+#  define RESULT_CODE       btrt_result_code
+#  define RUN_FILTERS       btrt_run_filters
+#  define WAIT_FOR_DEBUGGER btrt_wait_for_debugger
+#elif BOOST_VERSION < 106000
+#  define LIST_CONTENT      list_content
+#  define LIST_LABELS       list_labels
+#  define LOG_FORMAT        log_format
+#  define LOG_LEVEL         log_level
+#  define REPORT_FORMAT     report_format
+#  define RUN_FILTERS       test_to_run
+#  define WAIT_FOR_DEBUGGER wait_for_debugger
+#endif
+
 #if BOOST_VERSION >= 106000
 #  define attr_value utils::attr_value
-#  define RTCFG(type, new_name, old_name) \
-    but::runtime_config::get<type >(but::runtime_config::new_name)
+#  define RTCFG(type, name) \
+    but::runtime_config::get<type >(but::runtime_config::name)
 #else
-#  define RTCFG(type, new_name, old_name) but::runtime_config::old_name()
+#  define RTCFG(type, name) but::runtime_config::name()
 #  if BOOST_VERSION >= 105900
 #    define BOOST_TEST_I_TRY      BOOST_TEST_IMPL_TRY
 #    define BOOST_TEST_I_CATCH    BOOST_TEST_IMPL_CATCH
@@ -113,7 +132,7 @@
 #endif
 
 #define CONFIGURED_FILTERS \
-    RTCFG(std::vector<std::string>, RUN_FILTERS, test_to_run)
+    RTCFG(std::vector<std::string>, RUN_FILTERS)
 
 #ifdef NCBI_COMPILER_MSVC
 #  pragma warning(pop)
@@ -1645,8 +1664,7 @@
 inline void
 CNcbiTestApplication::x_SetupBoostReporters(void)
 {
-    but::output_format format = RTCFG(but::output_format, REPORT_FORMAT,
-                                      report_format);
+    but::output_format format = RTCFG(but::output_format, REPORT_FORMAT);
 
     CNcbiEnvironment env;
     string is_autobuild = env.Get("NCBI_AUTOMATED_BUILD");
@@ -1673,8 +1691,7 @@
     m_Reporter->SetOutputFormat(format);
     but::results_reporter::set_format(m_Reporter);
 
-    m_Logger->SetOutputFormat(RTCFG(but::output_format, LOG_FORMAT,
-                                    log_format));
+    m_Logger->SetOutputFormat(RTCFG(but::output_format, LOG_FORMAT));
     but::unit_test_log.set_formatter(m_Logger);
 }
 
@@ -2230,7 +2247,7 @@
 #endif
 
 #if BOOST_VERSION >= 105900
-        if( RTCFG(bool, WAIT_FOR_DEBUGGER, wait_for_debugger) ) {
+        if( RTCFG(bool, WAIT_FOR_DEBUGGER) ) {
             results_reporter::get_stream() << "Press any key to continue..." << std::endl;
 
             std::getchar();
@@ -2239,8 +2256,7 @@
 
         framework::finalize_setup_phase();
 
-        output_format list_cont = RTCFG(output_format, LIST_CONTENT,
-                                        list_content);
+        output_format list_cont = RTCFG(output_format, LIST_CONTENT);
         if( list_cont != but::OF_INVALID ) {
             if( list_cont == but::OF_DOT ) {
                 ut_detail::dot_content_reporter reporter( results_reporter::get_stream() );
@@ -2256,7 +2272,7 @@
             return boost::exit_success;
         }
 
-        if( RTCFG(bool, LIST_LABELS, list_labels) ) {
+        if( RTCFG(bool, LIST_LABELS) ) {
             ut_detail::labels_collector collector;
 
             traverse_test_tree( framework::master_test_suite().p_id, collector, true );
@@ -2283,7 +2299,7 @@
 
         if (
 #if BOOST_VERSION >= 106000
-            runtime_config::get<bool>( runtime_config::RESULT_CODE )
+            RTCFG(bool, RESULT_CODE)
 #else
             !runtime_config::no_result_code()
 #endif