diff --git a/test/enable_if_constructors.cpp b/test/enable_if_constructors.cpp
index 989c4ca..efa7dc8 100644
--- a/test/enable_if_constructors.cpp
+++ b/test/enable_if_constructors.cpp
@@ -45,14 +45,14 @@ struct xstring
 int test_main(int, char*[])
 {
  
-  BOOST_TEST(container(1).my_value);
-  BOOST_TEST(container(1.0).my_value);
+  BOOST_CHECK(container(1).my_value);
+  BOOST_CHECK(container(1.0).my_value);
 
-  BOOST_TEST(!container("1").my_value);  
-  BOOST_TEST(!container(static_cast<void*>(0)).my_value);  
+  BOOST_CHECK(!container("1").my_value);  
+  BOOST_CHECK(!container(static_cast<void*>(0)).my_value);  
 
   char sa[] = "123456";
-  BOOST_TEST(xstring<char>(sa, sa+6).data == 6);
+  BOOST_CHECK(xstring<char>(sa, sa+6).data == 6);
 
 
   return 0;
diff --git a/test/enable_if_dummy_arg_disambiguation.cpp b/test/enable_if_dummy_arg_disambiguation.cpp
index 2be0631..75bf9c7 100644
--- a/test/enable_if_dummy_arg_disambiguation.cpp
+++ b/test/enable_if_dummy_arg_disambiguation.cpp
@@ -33,11 +33,11 @@ arithmetic_object(T t, dummy<1> = 0) { return false; }
 int test_main(int, char*[])
 {
  
-  BOOST_TEST(arithmetic_object(1));
-  BOOST_TEST(arithmetic_object(1.0));
+  BOOST_CHECK(arithmetic_object(1));
+  BOOST_CHECK(arithmetic_object(1.0));
 
-  BOOST_TEST(!arithmetic_object("1"));  
-  BOOST_TEST(!arithmetic_object(static_cast<void*>(0)));  
+  BOOST_CHECK(!arithmetic_object("1"));  
+  BOOST_CHECK(!arithmetic_object(static_cast<void*>(0)));  
 
   return 0;
 }
diff --git a/test/enable_if_lazy.cpp b/test/enable_if_lazy.cpp
index fef927e..b9324e8 100644
--- a/test/enable_if_lazy.cpp
+++ b/test/enable_if_lazy.cpp
@@ -67,9 +67,9 @@ double mult(int i, double d) { return (double)i * d; }
 int test_main(int, char*[])
 {
  
-  BOOST_TEST(mult(1, 2) == 2);
-  BOOST_TEST(mult(1.0, 3.0) == 3.0);
-  BOOST_TEST(mult(1, 3.0) == 3.0);
+  BOOST_CHECK(mult(1, 2) == 2);
+  BOOST_CHECK(mult(1.0, 3.0) == 3.0);
+  BOOST_CHECK(mult(1, 3.0) == 3.0);
 
   return 0;
 }
diff --git a/test/enable_if_lazy_test.cpp b/test/enable_if_lazy_test.cpp
index 5a8ebca..1c4d25d 100644
--- a/test/enable_if_lazy_test.cpp
+++ b/test/enable_if_lazy_test.cpp
@@ -75,17 +75,17 @@ int test_main(int, char*[])
 {
   using namespace A;
   using namespace B;
-  BOOST_TEST(foo(1));
-  BOOST_TEST(foo(1.0));
+  BOOST_CHECK(foo(1));
+  BOOST_CHECK(foo(1.0));
 
-  BOOST_TEST(!foo("1"));  
-  BOOST_TEST(!foo(static_cast<void*>(0)));  
+  BOOST_CHECK(!foo("1"));  
+  BOOST_CHECK(!foo(static_cast<void*>(0)));  
 
-  BOOST_TEST(foo2(1));
-  BOOST_TEST(foo2(1.0));
+  BOOST_CHECK(foo2(1));
+  BOOST_CHECK(foo2(1.0));
 
-  BOOST_TEST(!foo2("1"));  
-  BOOST_TEST(!foo2(static_cast<void*>(0)));  
+  BOOST_CHECK(!foo2("1"));  
+  BOOST_CHECK(!foo2(static_cast<void*>(0)));  
 
   return 0;
 }
diff --git a/test/enable_if_member_templates.cpp b/test/enable_if_member_templates.cpp
index 72363bf..08d39d5 100644
--- a/test/enable_if_member_templates.cpp
+++ b/test/enable_if_member_templates.cpp
@@ -30,11 +30,11 @@ struct container {
 int test_main(int, char*[])
 {
  
-  BOOST_TEST(container().arithmetic_object(1));
-  BOOST_TEST(container().arithmetic_object(1.0));
+  BOOST_CHECK(container().arithmetic_object(1));
+  BOOST_CHECK(container().arithmetic_object(1.0));
 
-  BOOST_TEST(!container().arithmetic_object("1"));  
-  BOOST_TEST(!container().arithmetic_object(static_cast<void*>(0)));  
+  BOOST_CHECK(!container().arithmetic_object("1"));  
+  BOOST_CHECK(!container().arithmetic_object(static_cast<void*>(0)));  
 
   return 0;
 }
diff --git a/test/enable_if_namespace_disambiguation.cpp b/test/enable_if_namespace_disambiguation.cpp
index 71cd1a6..8865d4b 100644
--- a/test/enable_if_namespace_disambiguation.cpp
+++ b/test/enable_if_namespace_disambiguation.cpp
@@ -34,11 +34,11 @@ int test_main(int, char*[])
 {
   using namespace A;
   using namespace B;
-  BOOST_TEST(arithmetic_object(1));
-  BOOST_TEST(arithmetic_object(1.0));
+  BOOST_CHECK(arithmetic_object(1));
+  BOOST_CHECK(arithmetic_object(1.0));
 
-  BOOST_TEST(!arithmetic_object("1"));  
-  BOOST_TEST(!arithmetic_object(static_cast<void*>(0)));  
+  BOOST_CHECK(!arithmetic_object("1"));  
+  BOOST_CHECK(!arithmetic_object(static_cast<void*>(0)));  
 
   return 0;
 }
diff --git a/test/enable_if_no_disambiguation.cpp b/test/enable_if_no_disambiguation.cpp
index 5f2f2ac..e8eda34 100644
--- a/test/enable_if_no_disambiguation.cpp
+++ b/test/enable_if_no_disambiguation.cpp
@@ -30,11 +30,11 @@ arithmetic_object(T t) { return false; }
 int test_main(int, char*[])
 {
  
-  BOOST_TEST(arithmetic_object(1));
-  BOOST_TEST(arithmetic_object(1.0));
+  BOOST_CHECK(arithmetic_object(1));
+  BOOST_CHECK(arithmetic_object(1.0));
 
-  BOOST_TEST(!arithmetic_object("1"));  
-  BOOST_TEST(!arithmetic_object(static_cast<void*>(0)));  
+  BOOST_CHECK(!arithmetic_object("1"));  
+  BOOST_CHECK(!arithmetic_object(static_cast<void*>(0)));  
 
   return 0;
 }
diff --git a/test/enable_if_partial_specializations.cpp b/test/enable_if_partial_specializations.cpp
index 73610dc..6249e9d 100644
--- a/test/enable_if_partial_specializations.cpp
+++ b/test/enable_if_partial_specializations.cpp
@@ -48,17 +48,17 @@ struct tester2<T, typename disable_if<is_arithmetic<T> >::type> {
 int test_main(int, char*[])
 {
  
-  BOOST_TEST(tester<int>::value);
-  BOOST_TEST(tester<double>::value);
+  BOOST_CHECK(tester<int>::value);
+  BOOST_CHECK(tester<double>::value);
 
-  BOOST_TEST(!tester<char*>::value);
-  BOOST_TEST(!tester<void*>::value);
+  BOOST_CHECK(!tester<char*>::value);
+  BOOST_CHECK(!tester<void*>::value);
 
-  BOOST_TEST(tester2<int>::value);
-  BOOST_TEST(tester2<double>::value);
+  BOOST_CHECK(tester2<int>::value);
+  BOOST_CHECK(tester2<double>::value);
 
-  BOOST_TEST(!tester2<char*>::value);
-  BOOST_TEST(!tester2<void*>::value);
+  BOOST_CHECK(!tester2<char*>::value);
+  BOOST_CHECK(!tester2<void*>::value);
 
   return 0;
 }