diff --git a/bind_fastcall_mf_test.cpp b/bind_fastcall_mf_test.cpp
index dcf642b..e30a7b5 100644
--- a/bind_fastcall_mf_test.cpp
+++ b/bind_fastcall_mf_test.cpp
@@ -30,9 +30,7 @@
 #pragma warning(pop)
 #endif
 
-
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {
@@ -158,8 +156,8 @@ void member_function_test()
     BOOST_TEST( x.hash == 23558 );
 }
 
-int test_main(int, char * [])
+int main()
 {
     member_function_test();
-    return 0;
+    return boost::report_errors();
 }
diff --git a/bind_fastcall_test.cpp b/bind_fastcall_test.cpp
index 1da820d..e2ae97a 100644
--- a/bind_fastcall_test.cpp
+++ b/bind_fastcall_test.cpp
@@ -30,8 +30,7 @@
 #pragma warning(pop)
 #endif
 
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 //
 
@@ -103,8 +102,8 @@ void function_test()
     BOOST_TEST( bind(f_9, _1, 2, 3, 4, 5, 6, 7, 8, 9)(i) == 987654321L );
 }
 
-int test_main(int, char * [])
+int main()
 {
     function_test();
-    return 0;
+    return boost::report_errors();
 }
diff --git a/bind_stdcall_mf_test.cpp b/bind_stdcall_mf_test.cpp
index 8645a51..b3efa4d 100644
--- a/bind_stdcall_mf_test.cpp
+++ b/bind_stdcall_mf_test.cpp
@@ -30,9 +30,7 @@
 #pragma warning(pop)
 #endif
 
-
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {
@@ -158,8 +156,8 @@ void member_function_test()
     BOOST_TEST( x.hash == 23558 );
 }
 
-int test_main(int, char * [])
+int main()
 {
     member_function_test();
-    return 0;
+    return boost::report_errors();
 }
diff --git a/bind_stdcall_test.cpp b/bind_stdcall_test.cpp
index 20f3a69..a463c55 100644
--- a/bind_stdcall_test.cpp
+++ b/bind_stdcall_test.cpp
@@ -30,8 +30,7 @@
 #pragma warning(pop)
 #endif
 
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 //
 
@@ -103,8 +102,8 @@ void function_test()
     BOOST_TEST( bind(f_9, _1, 2, 3, 4, 5, 6, 7, 8, 9)(i) == 987654321L );
 }
 
-int test_main(int, char * [])
+int main()
 {
     function_test();
-    return 0;
+    return boost::report_errors();
 }
diff --git a/bind_test.cpp b/bind_test.cpp
index 5f44bdb..6777dfe 100644
--- a/bind_test.cpp
+++ b/bind_test.cpp
@@ -30,9 +30,7 @@
 #pragma warning(pop)
 #endif
 
-
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 //
 
@@ -485,7 +483,7 @@ void nested_bind_test()
     BOOST_TEST( (bind(fv_1, bind(f_0))(), (global_result == 17041L)) );
 }
 
-int test_main(int, char * [])
+int main()
 {
     function_test();
     function_object_test();
@@ -498,5 +496,5 @@ int test_main(int, char * [])
     member_function_void_test();
     nested_bind_test();
 
-    return 0;
+    return boost::report_errors();
 }