diff --git a/tests/is_convertible_test.cpp b/tests/is_convertible_test.cpp
index 4df0138..f4ec689 100644
--- a/tests/is_convertible_test.cpp
+++ b/tests/is_convertible_test.cpp
@@ -59,18 +59,6 @@ int cpp_main(int argc, char* argv[])
    value_test(false, (boost::is_convertible<test_abc1&, int_constructible>::value));
    value_test(false, (boost::is_convertible<int_constructible, test_abc1&>::value));
 
-   value_test(false, (boost::is_base_and_derived<Derived,Base>::value));
-   value_test(true, (boost::is_base_and_derived<Derived,Derived>::value));
-   value_test(true, (boost::is_base_and_derived<Base,Base>::value));
-   value_test(true, (boost::is_base_and_derived<Base,Derived>::value));
-   value_test(false, (boost::is_base_and_derived<NonDerived,Base>::value));
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-   value_test(false, (boost::is_base_and_derived<Base&,Derived>::value));
-   value_test(false, (boost::is_base_and_derived<Base&,Derived&>::value));
-   value_test(false, (boost::is_base_and_derived<Base,Derived&>::value));
-   value_test(false, (boost::is_base_and_derived<Base,void>::value));
-#endif
-
    return check_result(argc, argv);
 }
 
diff --git a/tests/object_type_traits_test.cpp b/tests/object_type_traits_test.cpp
index 5ac99c8..8661561 100644
--- a/tests/object_type_traits_test.cpp
+++ b/tests/object_type_traits_test.cpp
@@ -269,6 +269,24 @@ int cpp_main(int argc, char* argv[])
    soft_value_test(false, boost::is_empty<const non_empty&>::value)
    soft_value_test(true, boost::is_empty<non_default_constructable_UDT>::value)
 
+   value_test(false, (boost::is_base_and_derived<Derived,Base>::value));
+   value_test(true, (boost::is_base_and_derived<Derived,Derived>::value));
+   value_test(true, (boost::is_base_and_derived<Base,Base>::value));
+   value_test(true, (boost::is_base_and_derived<Base,Derived>::value));
+   value_test(false, (boost::is_base_and_derived<NonDerived,Base>::value));
+   value_test(false, (boost::is_base_and_derived<Base,void>::value));
+   value_test(false, (boost::is_base_and_derived<Base,const void>::value));
+   value_test(false, (boost::is_base_and_derived<void,Derived>::value));
+   value_test(false, (boost::is_base_and_derived<const void,Derived>::value));
+   value_test(false, (boost::is_base_and_derived<int, int>::value));
+   value_test(false, (boost::is_base_and_derived<const int, int>::value));
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+   value_test(false, (boost::is_base_and_derived<Base&,Derived>::value));
+   value_test(false, (boost::is_base_and_derived<Base&,Derived&>::value));
+   value_test(false, (boost::is_base_and_derived<Base,Derived&>::value));
+   value_test(false, (boost::is_base_and_derived<Base,void>::value));
+#endif
+
    return check_result(argc, argv);
 }