diff --git a/test/algorithm_test.cpp b/test/algorithm_test.cpp
index 079b771..4b2f252 100644
--- a/test/algorithm_test.cpp
+++ b/test/algorithm_test.cpp
@@ -11,7 +11,8 @@
 
 // test using BLL and boost::function
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/bind.hpp"
@@ -46,15 +47,9 @@ void test_foreach() {
 
 // More tests needed (for all algorithms)
 
-int test_main(int, char *[]) {
+int main() {
 
   test_foreach();
 
-  return 0;
+  return boost::report_errors();
 }
-
-
-
-
-
-
diff --git a/test/bind_tests_advanced.cpp b/test/bind_tests_advanced.cpp
index b33d10a..0a5b460 100644
--- a/test/bind_tests_advanced.cpp
+++ b/test/bind_tests_advanced.cpp
@@ -13,7 +13,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/bind.hpp"
@@ -413,7 +414,7 @@ void test_abstract()
   BOOST_CHECK(bind(&base::foo, *_1)(&b) == 1);
 }
 
-int test_main(int, char *[]) {
+int main() {
 
   test_nested_binds();
   test_unlambda();
@@ -424,5 +425,5 @@ int test_main(int, char *[]) {
   test_break_const(); 
   test_sig();
   test_abstract();
-  return 0;
+  return boost::report_errors();
 }
diff --git a/test/bind_tests_simple.cpp b/test/bind_tests_simple.cpp
index 1e63d69..f1c5e4e 100644
--- a/test/bind_tests_simple.cpp
+++ b/test/bind_tests_simple.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/bind.hpp"
 
@@ -97,7 +98,7 @@ void test_data_members()
   BOOST_CHECK(b.i == 1);
 }
 
-int test_main(int, char *[]) {
+int main() {
 
   int i = 1; int j = 2; int k = 3;
   int result;
@@ -183,5 +184,5 @@ int test_main(int, char *[]) {
   test_member_functions();
 
 
-  return 0;
+  return boost::report_errors();
 }
diff --git a/test/bind_tests_simple_f_refs.cpp b/test/bind_tests_simple_f_refs.cpp
index df601d7..69bb280 100644
--- a/test/bind_tests_simple_f_refs.cpp
+++ b/test/bind_tests_simple_f_refs.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/bind.hpp"
 
@@ -57,7 +58,7 @@ void test_member_functions()
   // bind(&A::add, a, _1); 
 }
 
-int test_main(int, char *[]) {
+int main() {
 
   int i = 1; int j = 2; int k = 3;
   int result;
@@ -144,5 +145,5 @@ int test_main(int, char *[]) {
   test_member_functions();
 
 
-  return 0;
+  return boost::report_errors();
 }
diff --git a/test/bll_and_function.cpp b/test/bll_and_function.cpp
index 03bcc3e..3e11e1b 100644
--- a/test/bll_and_function.cpp
+++ b/test/bll_and_function.cpp
@@ -11,7 +11,8 @@
 
 // test using BLL and boost::function
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/lambda.hpp"
 
@@ -54,15 +55,9 @@ void test_function() {
 }
 
 
-int test_main(int, char *[]) {
+int main() {
 
   test_function();
 
-  return 0;
+  return boost::report_errors();
 }
-
-
-
-
-
-
diff --git a/test/cast_test.cpp b/test/cast_test.cpp
index eba4300..1f0c1d0 100644
--- a/test/cast_test.cpp
+++ b/test/cast_test.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 
 #include "boost/lambda/lambda.hpp"
@@ -100,8 +101,8 @@ void do_test() {
 
 }
 
-int test_main(int, char *[]) {
+int main() {
 
   do_test();
-  return 0;
+  return boost::report_errors();
 }
diff --git a/test/constructor_tests.cpp b/test/constructor_tests.cpp
index 8cef0cb..96ce6e8 100644
--- a/test/constructor_tests.cpp
+++ b/test/constructor_tests.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 
 #include "boost/lambda/lambda.hpp"
@@ -252,7 +253,7 @@ void delayed_construction()
             bl::bind(constructor<std::pair<int, int> >(), _1, _2) );
 }
 
-int test_main(int, char *[]) {
+int main() {
 
   constructor_all_lengths();
   new_ptr_all_lengths();
@@ -261,5 +262,5 @@ int test_main(int, char *[]) {
   test_news_and_deletes();  
   test_array_new_and_delete();
   
-  return 0;
+  return boost::report_errors();
 }
diff --git a/test/control_structures.cpp b/test/control_structures.cpp
index 12eabf8..e2bb870 100644
--- a/test/control_structures.cpp
+++ b/test/control_structures.cpp
@@ -11,7 +11,8 @@
 
 // -----------------------------------------------------------------------
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/if.hpp"
@@ -115,9 +116,9 @@ void simple_ifs () {
 }
 
 
-int test_main(int, char *[]) 
+int main()
 {
   simple_loops();
   simple_ifs();
-  return 0;
+  return boost::report_errors();
 }
diff --git a/test/exception_test.cpp b/test/exception_test.cpp
index ee90666..661541f 100644
--- a/test/exception_test.cpp
+++ b/test/exception_test.cpp
@@ -11,7 +11,8 @@
 
 // -----------------------------------------------------------------------
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/lambda.hpp"
 
@@ -595,7 +596,7 @@ void return_type_matching() {
   BOOST_CHECK(a == 'b');
 }
   
-int test_main(int, char *[]) {   
+int main() {
 
   try 
   {
@@ -613,9 +614,5 @@ int test_main(int, char *[]) {
   }
 
 
-  return EXIT_SUCCESS;
+  return boost::report_errors();
 }
-
-
-
-
diff --git a/test/extending_rt_traits.cpp b/test/extending_rt_traits.cpp
index 56916ab..731379a 100644
--- a/test/extending_rt_traits.cpp
+++ b/test/extending_rt_traits.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/bind.hpp"
 #include "boost/lambda/lambda.hpp"
@@ -381,14 +382,8 @@ void test_binary_operators() {
 }
 
 
-int test_main(int, char *[]) {
+int main() {
   test_unary_operators();
   test_binary_operators();
-  return 0;
+  return boost::report_errors();
 }
-
-
-
-
-
-
diff --git a/test/is_instance_of_test.cpp b/test/is_instance_of_test.cpp
index d1c57b3..8df1026 100644
--- a/test/is_instance_of_test.cpp
+++ b/test/is_instance_of_test.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
  
 
 #include "boost/lambda/detail/is_instance_of.hpp"
@@ -45,7 +46,7 @@ template <bool b> class X {};
 X<boost::lambda::is_instance_of_2<int, A2>::value> x;
 
 
-int test_main(int, char *[]) {
+int main() {
 
 using boost::lambda::is_instance_of_1;
 using boost::lambda::is_instance_of_2;
@@ -73,7 +74,6 @@ BOOST_CHECK((is_instance_of_4<A4<int, float, char, double>, A4>::value == true))
 BOOST_CHECK((is_instance_of_4<int, A4>::value == false));
 BOOST_CHECK((is_instance_of_4<C4, A4>::value == false));
 
-return 0;
+return boost::report_errors();
 
 }
-
diff --git a/test/istreambuf_test.cpp b/test/istreambuf_test.cpp
index 6db0842..85ef6eb 100644
--- a/test/istreambuf_test.cpp
+++ b/test/istreambuf_test.cpp
@@ -7,7 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/lambda/lambda.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iterator>
 #include <sstream>
 #include <algorithm>
diff --git a/test/member_pointer_test.cpp b/test/member_pointer_test.cpp
index e8121d5..9f7b79b 100644
--- a/test/member_pointer_test.cpp
+++ b/test/member_pointer_test.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 
 #include "boost/lambda/lambda.hpp"
@@ -182,11 +183,10 @@ void test_overloaded_pointer_to_member()
 }
 
 
-int test_main(int, char *[]) {
+int main() {
 
   pointer_to_data_member_tests();
   pointer_to_member_function_tests();
   test_overloaded_pointer_to_member();
-  return 0;
+  return boost::report_errors();
 }
-
diff --git a/test/operator_tests_simple.cpp b/test/operator_tests_simple.cpp
index 34711fb..7fe8836 100644
--- a/test/operator_tests_simple.cpp
+++ b/test/operator_tests_simple.cpp
@@ -13,7 +13,8 @@
 
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/lambda.hpp"
 
@@ -408,7 +409,7 @@ void pointer_arithmetic() {
 
 }
 
-int test_main(int, char *[]) {
+int main() {
 
   arithmetic_operators();
   bitwise_operators();
@@ -421,11 +422,5 @@ int test_main(int, char *[]) {
   comma();
   pointer_arithmetic();
   cout_tests();
-  return 0;
+  return boost::report_errors();
 }
-
-
-
-
-
-
diff --git a/test/phoenix_control_structures.cpp b/test/phoenix_control_structures.cpp
index 722a74f..d115614 100644
--- a/test/phoenix_control_structures.cpp
+++ b/test/phoenix_control_structures.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/if.hpp"
@@ -36,7 +37,7 @@ using namespace std;
 //  If-else, while, do-while, for statements
 
 
-int test_main(int, char *[]) {
+int main() {
 
     vector<int> v;
     v.clear();
@@ -143,6 +144,5 @@ int test_main(int, char *[]) {
 
     v = t;
 
-    return 0;
+    return boost::report_errors();
 }
-
diff --git a/test/result_of_tests.cpp b/test/result_of_tests.cpp
index d97f00e..148af64 100644
--- a/test/result_of_tests.cpp
+++ b/test/result_of_tests.cpp
@@ -11,7 +11,9 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
+
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/assert.hpp>
@@ -252,7 +254,7 @@ typename boost::result_of<F(A, B, C)>::type apply3(F f, A a, B b, C c) {
 
 using namespace boost::lambda;
 
-int test_main(int, char *[]) {
+int main() {
     BOOST_CHECK(boost::lambda::bind(with_result_type())() == 0);
     BOOST_CHECK(boost::lambda::bind(with_result_type(), 1)() == 1);
     BOOST_CHECK(boost::lambda::bind(with_result_type(), 1, 2)() == 2);
@@ -311,5 +313,5 @@ int test_main(int, char *[]) {
     BOOST_CHECK((apply3<int&, int&, int&>(_1 + _2 + _3, one, two, three) == 6));
     BOOST_CHECK((apply3<const int&, const int&, const int&>(_1 + _2 + _3, one, two, three) == 6));
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/test/ret_test.cpp b/test/ret_test.cpp
index 82c947f..bb65935 100644
--- a/test/ret_test.cpp
+++ b/test/ret_test.cpp
@@ -8,7 +8,8 @@
 //
 // For more information, see www.boost.org
 
-#include <boost/test/minimal.hpp>
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 #include <boost/lambda/lambda.hpp>
 
@@ -44,10 +45,10 @@ add_result operator+(addable, addable) {
     return add_result(7);
 }
 
-int test_main(int, char*[]) {
+int main() {
     addable test;
     test_ret(add_result(7), boost::lambda::ret<add_result>(boost::lambda::_1 + test), test);
     test_ret(8.0, boost::lambda::ret<double>(boost::lambda::constant(7) + 1));
 
-    return 0;
+    return boost::report_errors();
 }
diff --git a/test/rvalue_test.cpp b/test/rvalue_test.cpp
index 3735185..ea2701c 100644
--- a/test/rvalue_test.cpp
+++ b/test/rvalue_test.cpp
@@ -7,7 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/lambda/lambda.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/switch_construct.cpp b/test/switch_construct.cpp
index a0599fe..8281979 100644
--- a/test/switch_construct.cpp
+++ b/test/switch_construct.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------
 
 
-#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
+#include <boost/core/lightweight_test.hpp>
+#define BOOST_CHECK BOOST_TEST
 
 
 #include "boost/lambda/lambda.hpp"
@@ -379,14 +380,13 @@ void test_empty_cases() {
 
 }
 
-int test_main(int, char* []) {
+int main() {
 
   do_switch_no_defaults_tests();
   do_switch_yes_defaults_tests();
 
   test_empty_cases();
 
-  return EXIT_SUCCESS;
+  return boost::report_errors();
 
 }
-