diff --git a/test/list_test.cpp b/test/list_test.cpp
index af7cd00..d250bb0 100644
--- a/test/list_test.cpp
+++ b/test/list_test.cpp
@@ -538,9 +538,6 @@ int main()
    test_main_template<boost::intrusive::smart_ptr<void>, false, true>()();
    test_main_template<void*, true, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true, true>()();
-   // test (plain pointers) x (nonconst/const size) x (standard node allocator)
-   test_main_template<void*, false, false>()();
-   test_main_template<void*, true, false>()();
    // test (bounded pointers) x ((nonconst/const size) x (special node allocator)
    test_main_template_bptr< true >()();
    test_main_template_bptr< false >()();
diff --git a/test/multiset_test.cpp b/test/multiset_test.cpp
index 77db6e8..7cf374c 100644
--- a/test/multiset_test.cpp
+++ b/test/multiset_test.cpp
@@ -239,9 +239,6 @@ int main()
    test_main_template<boost::intrusive::smart_ptr<void>, false, true>()();
    test_main_template<void*, true, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true, true>()();
-   // test (plain pointers) x (nonconst/const size) x (standard node allocator)
-   test_main_template<void*, false, false>()();
-   test_main_template<void*, true, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
    test_main_template_bptr< true >()();
    test_main_template_bptr< false >()();
diff --git a/test/pointer_traits_test.cpp b/test/pointer_traits_test.cpp
index 1deda45..15a5278 100644
--- a/test/pointer_traits_test.cpp
+++ b/test/pointer_traits_test.cpp
@@ -8,7 +8,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/intrusive/detail/config_begin.hpp>
-#include <boost/type_traits/is_same.hpp>
+#include <boost/intrusive/detail/mpl.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 
@@ -120,13 +120,13 @@ int main()
    int dummy;
 
    //Raw pointer
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        <int*>::element_type, int>::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        <int*>::pointer, int*>::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        <int*>::difference_type, std::ptrdiff_t>::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        <int*>::rebind_pointer<double>::type
                        , double*>::value ));
    if(boost::intrusive::pointer_traits<int*>::pointer_to(dummy) != &dummy){
@@ -143,13 +143,13 @@ int main()
    }
 
    //Complete smart pointer
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < CompleteSmartPtr<int> >::element_type, int>::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < CompleteSmartPtr<int> >::pointer, CompleteSmartPtr<int> >::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < CompleteSmartPtr<int> >::difference_type, char>::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < CompleteSmartPtr<int> >::rebind_pointer<double>::type
                        , CompleteSmartPtr<double> >::value ));
    if(boost::intrusive::pointer_traits< CompleteSmartPtr<int> >
@@ -170,13 +170,13 @@ int main()
    }
 
    //Simple smart pointer
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < SimpleSmartPtr<int> >::element_type, int>::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < SimpleSmartPtr<int> >::pointer, SimpleSmartPtr<int> >::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < SimpleSmartPtr<int> >::difference_type, std::ptrdiff_t>::value ));
-   BOOST_STATIC_ASSERT(( boost::is_same<boost::intrusive::pointer_traits
+   BOOST_STATIC_ASSERT(( boost::intrusive::detail::is_same<boost::intrusive::pointer_traits
                        < SimpleSmartPtr<int> >::rebind_pointer<double>::type
                        , SimpleSmartPtr<double> >::value ));
    if(boost::intrusive::pointer_traits< SimpleSmartPtr<int> >
diff --git a/test/set_test.cpp b/test/set_test.cpp
index 25b75fc..e712029 100644
--- a/test/set_test.cpp
+++ b/test/set_test.cpp
@@ -242,9 +242,6 @@ int main()
    test_main_template<boost::intrusive::smart_ptr<void>, false, true>()();
    test_main_template<void*, true, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true, true>()();
-   //test (plain pointers) x (nonconst/const size) x (standard node allocator)
-   test_main_template<void*, false, false>()();
-   test_main_template<void*, true, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
    test_main_template_bptr< true >()();
    test_main_template_bptr< false >()();
diff --git a/test/sg_multiset_test.cpp b/test/sg_multiset_test.cpp
index 584f499..1ce5611 100644
--- a/test/sg_multiset_test.cpp
+++ b/test/sg_multiset_test.cpp
@@ -273,7 +273,6 @@ struct Get_Preset_Container
     };
 };
 
-template < bool ConstantTimeSize >
 struct test_main_template_bptr
 {
     void operator () ()
@@ -284,8 +283,8 @@ struct test_main_template_bptr
 
         allocator_type::init();
         test::test_generic_multiset< value_traits,
-                                Get_Preset_Container< value_traits, ConstantTimeSize,
-                                                      bounded_pointer_holder< value_type > >::template GetContainer
+                                Get_Preset_Container< value_traits, true,
+                                                      bounded_pointer_holder< value_type > >::GetContainer
                               >::test_all();
         assert(allocator_type::is_clear());
         allocator_type::destroy();
@@ -297,11 +296,8 @@ int main()
    // test (plain/smart pointers) x (const size) x (void node allocator)
    test_main_template<void*, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true >()();
-   // test (plain pointers) x (const size) x (standard node allocator)
-   test_main_template<void*, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
-   test_main_template_bptr< true >()();
-   test_main_template_bptr< false >()();
+   test_main_template_bptr()();
 
    return boost::report_errors();
 }
diff --git a/test/sg_set_test.cpp b/test/sg_set_test.cpp
index 104f9da..8a3363a 100644
--- a/test/sg_set_test.cpp
+++ b/test/sg_set_test.cpp
@@ -271,7 +271,6 @@ struct Get_Preset_Container
     };
 };
 
-template < bool ConstantTimeSize >
 struct test_main_template_bptr
 {
     void operator () ()
@@ -282,8 +281,8 @@ struct test_main_template_bptr
 
         allocator_type::init();
         test::test_generic_set< value_traits,
-                                Get_Preset_Container< value_traits, ConstantTimeSize,
-                                                      bounded_pointer_holder< value_type > >::template GetContainer
+                                Get_Preset_Container< value_traits, true,
+                                                      bounded_pointer_holder< value_type > >::GetContainer
                               >::test_all();
         assert(allocator_type::is_clear());
         allocator_type::destroy();
@@ -298,8 +297,7 @@ int main()
    // test (plain pointers) x (const size) x (standard node allocator)
    test_main_template<void*, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
-   test_main_template_bptr< true >()();
-   test_main_template_bptr< false >()();
+   test_main_template_bptr()();
 
    return boost::report_errors();
 }
diff --git a/test/splay_multiset_test.cpp b/test/splay_multiset_test.cpp
index 54a2f78..7682cdb 100644
--- a/test/splay_multiset_test.cpp
+++ b/test/splay_multiset_test.cpp
@@ -271,9 +271,6 @@ int main()
    test_main_template<boost::intrusive::smart_ptr<void>, false, true>()();
    test_main_template<void*, true, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true, true>()();
-   // test (plain pointers) x (nonconst/const size) x (standard node allocator)
-   test_main_template<void*, false, false>()();
-   test_main_template<void*, true, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
    test_main_template_bptr< true >()();
    test_main_template_bptr< false >()();
diff --git a/test/splay_set_test.cpp b/test/splay_set_test.cpp
index c7ccd3f..697f6b3 100644
--- a/test/splay_set_test.cpp
+++ b/test/splay_set_test.cpp
@@ -268,9 +268,6 @@ int main()
    test_main_template<boost::intrusive::smart_ptr<void>, false, true>()();
    test_main_template<void*, true, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true, true>()();
-   // test (plain pointers) x (nonconst/const size) x (standard node allocator)
-   test_main_template<void*, false, false>()();
-   test_main_template<void*, true, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
    test_main_template_bptr< true >()();
    test_main_template_bptr< false >()();
diff --git a/test/treap_multiset_test.cpp b/test/treap_multiset_test.cpp
index ebea562..bb2b36d 100644
--- a/test/treap_multiset_test.cpp
+++ b/test/treap_multiset_test.cpp
@@ -236,9 +236,6 @@ int main()
    test_main_template<boost::intrusive::smart_ptr<void>, false, true>()();
    test_main_template<void*, true, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true, true>()();
-   // test (plain pointers) x (nonconst/const size) x (standard node allocator)
-   test_main_template<void*, false, false>()();
-   test_main_template<void*, true, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
    test_main_template_bptr< true >()();
    test_main_template_bptr< false >()();
diff --git a/test/treap_set_test.cpp b/test/treap_set_test.cpp
index abc9be2..da80eed 100644
--- a/test/treap_set_test.cpp
+++ b/test/treap_set_test.cpp
@@ -252,9 +252,6 @@ int main()
    test_main_template<boost::intrusive::smart_ptr<void>, false, true>()();
    test_main_template<void*, true, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true, true>()();
-   // test (plain pointers) x (nonconst/const size) x (standard node allocator)
-   test_main_template<void*, false, false>()();
-   test_main_template<void*, true, false>()();
    // test (bounded pointers) x (nonconst/const size) x (special node allocator)
    test_main_template_bptr< true >()();
    test_main_template_bptr< false >()();