diff --git a/test/allocator_const_pointer_test.cpp b/test/allocator_const_pointer_test.cpp
index 16ae707..fb83627 100644
--- a/test/allocator_const_pointer_test.cpp
+++ b/test/allocator_const_pointer_test.cpp
@@ -15,20 +15,16 @@ struct A1 {
     typedef int* const_pointer;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
         boost::allocator_const_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const int*,
         boost::allocator_const_pointer<A2<int> >::type>));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_const_void_pointer_test.cpp b/test/allocator_const_void_pointer_test.cpp
index c07070d..9f8610c 100644
--- a/test/allocator_const_void_pointer_test.cpp
+++ b/test/allocator_const_void_pointer_test.cpp
@@ -20,20 +20,16 @@ struct A1 {
     };
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
         boost::allocator_const_void_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const void*,
         boost::allocator_const_void_pointer<A2<int> >::type>));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_difference_type_test.cpp b/test/allocator_difference_type_test.cpp
index 24c373d..c0c0316 100644
--- a/test/allocator_difference_type_test.cpp
+++ b/test/allocator_difference_type_test.cpp
@@ -15,20 +15,16 @@ struct A1 {
     typedef short difference_type;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<short,
         boost::allocator_difference_type<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<std::ptrdiff_t,
         boost::allocator_difference_type<A2<int> >::type>));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_is_always_equal_test.cpp b/test/allocator_is_always_equal_test.cpp
index c0d8bf2..fd2c03e 100644
--- a/test/allocator_is_always_equal_test.cpp
+++ b/test/allocator_is_always_equal_test.cpp
@@ -15,7 +15,6 @@ struct A1 {
     int value;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
@@ -24,24 +23,25 @@ struct A2 {
 template<class T>
 struct A3 {
     typedef T value_type;
-    typedef std::false_type is_always_equal;
+    struct is_always_equal {
+        static const bool value = false;
+    };
 };
 
 template<class T>
 struct A4 {
     typedef T value_type;
-    typedef std::true_type is_always_equal;
+    struct is_always_equal {
+        static const bool value = true;
+    };
     int value;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_FALSE((boost::allocator_is_always_equal<A1<int> >::type));
- #if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::allocator_is_always_equal<A2<int> >::type));
     BOOST_TEST_TRAIT_FALSE((boost::allocator_is_always_equal<A3<int> >::type));
     BOOST_TEST_TRAIT_TRUE((boost::allocator_is_always_equal<A4<int> >::type));
- #endif
     return boost::report_errors();
 }
diff --git a/test/allocator_max_size_test.cpp b/test/allocator_max_size_test.cpp
index 7da57d6..b2837f1 100644
--- a/test/allocator_max_size_test.cpp
+++ b/test/allocator_max_size_test.cpp
@@ -19,21 +19,17 @@ struct A1 {
     }
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
     typedef short size_type;
     A2() { }
 };
-#endif
 
 int main()
 {
     BOOST_TEST_EQ(boost::allocator_max_size(A1<int>()), 1);
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_LE(boost::allocator_max_size(A2<int>()),
         (std::numeric_limits<short>::max)());
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_pocca_test.cpp b/test/allocator_pocca_test.cpp
index 2318652..853473a 100644
--- a/test/allocator_pocca_test.cpp
+++ b/test/allocator_pocca_test.cpp
@@ -14,21 +14,19 @@ struct A1 {
     typedef T value_type;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
-    typedef std::true_type propagate_on_container_copy_assignment;
+    struct propagate_on_container_copy_assignment {
+        static const bool value = true;
+    };
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_FALSE((boost::
         allocator_propagate_on_container_copy_assignment<A1<int> >::type));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::
         allocator_propagate_on_container_copy_assignment<A2<int> >::type));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_pocma_test.cpp b/test/allocator_pocma_test.cpp
index a971c02..6c0c8e3 100644
--- a/test/allocator_pocma_test.cpp
+++ b/test/allocator_pocma_test.cpp
@@ -14,21 +14,19 @@ struct A1 {
     typedef T value_type;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
-    typedef std::true_type propagate_on_container_move_assignment;
+    struct propagate_on_container_move_assignment {
+        static const bool value = true;
+    };
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_FALSE((boost::
         allocator_propagate_on_container_move_assignment<A1<int> >::type));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::
         allocator_propagate_on_container_move_assignment<A2<int> >::type));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_pocs_test.cpp b/test/allocator_pocs_test.cpp
index 1a8e6e2..2f90f3f 100644
--- a/test/allocator_pocs_test.cpp
+++ b/test/allocator_pocs_test.cpp
@@ -14,21 +14,19 @@ struct A1 {
     typedef T value_type;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
-    typedef std::true_type propagate_on_container_swap;
+    struct propagate_on_container_swap {
+        static const bool value = true;
+    };
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_FALSE((boost::
         allocator_propagate_on_container_swap<A1<int> >::type));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::
         allocator_propagate_on_container_swap<A2<int> >::type));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_pointer_test.cpp b/test/allocator_pointer_test.cpp
index 6359492..6ff445e 100644
--- a/test/allocator_pointer_test.cpp
+++ b/test/allocator_pointer_test.cpp
@@ -15,20 +15,16 @@ struct A1 {
     typedef int* pointer;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
         boost::allocator_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
         boost::allocator_pointer<A2<int> >::type>));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_rebind_test.cpp b/test/allocator_rebind_test.cpp
index 4e35da4..88015f2 100644
--- a/test/allocator_rebind_test.cpp
+++ b/test/allocator_rebind_test.cpp
@@ -18,20 +18,16 @@ struct A1 {
     };
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<A1<int>,
         boost::allocator_rebind<A1<char>, bool>::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<A2<int>,
         boost::allocator_rebind<A2<char>, int>::type>));
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_soccc_test.cpp b/test/allocator_soccc_test.cpp
index 2d25fbd..7f65233 100644
--- a/test/allocator_soccc_test.cpp
+++ b/test/allocator_soccc_test.cpp
@@ -16,7 +16,6 @@ struct A1 {
     int value;
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
@@ -27,15 +26,12 @@ struct A2 {
     }
     int value;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_EQ(1, boost::
         allocator_select_on_container_copy_construction(A1<int>(1)).value);
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_EQ(2, boost::
         allocator_select_on_container_copy_construction(A2<int>(1)).value);
-#endif
     return boost::report_errors();
 }
diff --git a/test/allocator_void_pointer_test.cpp b/test/allocator_void_pointer_test.cpp
index c5c08c1..d7133be 100644
--- a/test/allocator_void_pointer_test.cpp
+++ b/test/allocator_void_pointer_test.cpp
@@ -20,20 +20,16 @@ struct A1 {
     };
 };
 
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T>
 struct A2 {
     typedef T value_type;
 };
-#endif
 
 int main()
 {
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
         boost::allocator_void_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     BOOST_TEST_TRAIT_TRUE((boost::core::is_same<void*,
         boost::allocator_void_pointer<A2<int> >::type>));
-#endif
     return boost::report_errors();
 }