diff --git a/test/test_assertion_construction.cpp b/test/test_assertion_construction.cpp
index d2608dd3..350095a1 100644
--- a/test/test_assertion_construction.cpp
+++ b/test/test_assertion_construction.cpp
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE( test_basic_value_expression_construction )
         BOOST_CHECK( res );
     }
 
-#ifndef BOOST_NO_DECLTYPE
+#ifndef BOOST_NO_CXX11_DECLTYPE
     {
         EXPR_TYPE E = seed->* "abc";
         predicate_result const& res = E.evaluate();
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE( test_comparison_expression )
 
 //____________________________________________________________________________//
 
-#ifndef BOOST_NO_DECLTYPE
+#ifndef BOOST_NO_CXX11_DECLTYPE
 
 BOOST_AUTO_TEST_CASE( test_arithmetic_ops )
 {
@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE( test_arithmetic_ops )
 
 //____________________________________________________________________________//
 
-#endif // BOOST_NO_DECLTYPE
+#endif // BOOST_NO_CXX11_DECLTYPE
 
 struct Testee {
     static int s_copy_counter;
@@ -353,7 +353,7 @@ BOOST_AUTO_TEST_CASE( test_pointers )
         BOOST_CHECK_EQUAL( res.message(), "(bool)Testee is false" );
     }
 
-#ifndef BOOST_NO_DECLTYPE
+#ifndef BOOST_NO_CXX11_DECLTYPE
     {
         Testee obj;
         Testee* ptr =&obj;
diff --git a/test/test_datasets_src/test_random.cpp b/test/test_datasets_src/test_random.cpp
index 17db879f..dda50cf4 100755
--- a/test/test_datasets_src/test_random.cpp
+++ b/test/test_datasets_src/test_random.cpp
@@ -15,7 +15,7 @@
 // Boost.Test
 #include <boost/test/unit_test.hpp>
 
-#ifndef BOOST_NO_0X_HDR_RANDOM
+#ifndef BOOST_NO_CXX11_HDR_RANDOM
 
 #include <boost/test/data/monomorphic/generators/random.hpp>
 #include <boost/test/data/monomorphic/zip.hpp>
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE( test_parameterized_init )
 
 //____________________________________________________________________________//
 
-#endif // BOOST_NO_0X_HDR_RANDOM
+#endif // BOOST_NO_CXX11_HDR_RANDOM
 
 
 // EOF
diff --git a/test/test_tools_test.cpp b/test/test_tools_test.cpp
index fae3f149..8dbc50cb 100644
--- a/test/test_tools_test.cpp
+++ b/test/test_tools_test.cpp
@@ -649,7 +649,7 @@ public:
     int         operator&()     { return 10; }
 };
 
-#ifndef BOOST_NO_DECLTYPE
+#ifndef BOOST_NO_CXX11_DECLTYPE
 #define BOOST_TEST_FWD_1(P,M) BOOST_TEST(P)
 #define BOOST_TEST_FWD_3(P,M) BOOST_TEST(P)
 #else