diff --git a/test/error_info_basic_test.cpp b/test/error_info_basic_test.cpp
index aa8d6a7..488360d 100644
--- a/test/error_info_basic_test.cpp
+++ b/test/error_info_basic_test.cpp
@@ -7,7 +7,7 @@
 #include <boost/exception/exception.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/exception/get_error_info.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <string>
 #include <string.h>
 
@@ -25,5 +25,5 @@ main()
         {
         BOOST_TEST(boost::get_error_info<error_info_string>(e) && !strcmp(boost::get_error_info<error_info_string>(e)->c_str(),"doh"));
         }
-    return 0;
+    return boost::report_errors();
     }
diff --git a/test/no_exceptions_test.cpp b/test/no_exceptions_test.cpp
index 2609be6..d335fb6 100644
--- a/test/no_exceptions_test.cpp
+++ b/test/no_exceptions_test.cpp
@@ -8,7 +8,7 @@
 #include <boost/throw_exception.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/exception/diagnostic_information.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <stdlib.h>
 
 struct
@@ -39,7 +39,7 @@ boost
 #ifndef BOOST_NO_RTTI
         BOOST_TEST(s.find("my_tag")!=std::string::npos);
 #endif
-        exit(0);
+        exit(boost::report_errors());
         }
     }