diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f0ee88da..2f6a122a 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -78,7 +78,7 @@ test-suite config
      [ run config_info.cpp : : : <test-info>always_show_run_output <exception-handling>off : config_info_no_except ]
      [ run math_info.cpp : : : <test-info>always_show_run_output <toolset>borland:<runtime-link>static <toolset>borland:<link>static ]
      [ run abi/abi_test.cpp abi/main.cpp ]
-     [ run limits_test.cpp ../../test/build//boost_test_exec_monitor ]
+     [ run limits_test.cpp ]
      [ run link/main.cpp link//link_test
           : #args
           : #input-files
diff --git a/test/limits_test.cpp b/test/limits_test.cpp
index 3a4cd3a6..62444965 100644
--- a/test/limits_test.cpp
+++ b/test/limits_test.cpp
@@ -9,8 +9,8 @@
  */
 
 #include <boost/limits.hpp>
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/detail/lightweight_main.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 
 /*
@@ -82,10 +82,10 @@ void test_integral_limits(const T &, const char * msg)
             << ", max: " << make_char_numeric_for_streaming((lim::max)())
             << std::endl;
 
-  BOOST_CHECK(static_cast<bool>(lim::is_specialized));
-  BOOST_CHECK(static_cast<bool>(lim::is_integer));
-  // BOOST_CHECK(lim::is_modulo);
-  BOOST_CHECK(static_cast<bool>((lim::min)() < (lim::max)()));
+  BOOST_TEST(static_cast<bool>(lim::is_specialized));
+  BOOST_TEST(static_cast<bool>(lim::is_integer));
+  // BOOST_TEST(lim::is_modulo);
+  BOOST_TEST(static_cast<bool>((lim::min)() < (lim::max)()));
 }
 
 template <class T>
@@ -107,10 +107,10 @@ void test_float_limits(const T &, const char * msg)
   std::cout << "\nTesting " << msg << std::endl;
   typedef std::numeric_limits<T> lim;
 
-  BOOST_CHECK(static_cast<bool>(lim::is_specialized));
-  BOOST_CHECK(static_cast<bool>(!lim::is_modulo));
-  BOOST_CHECK(static_cast<bool>(!lim::is_integer));
-  BOOST_CHECK(static_cast<bool>(lim::is_signed));
+  BOOST_TEST(static_cast<bool>(lim::is_specialized));
+  BOOST_TEST(static_cast<bool>(!lim::is_modulo));
+  BOOST_TEST(static_cast<bool>(!lim::is_integer));
+  BOOST_TEST(static_cast<bool>(lim::is_signed));
 
   const T infinity = lim::infinity();
   const T qnan = lim::quiet_NaN();
@@ -127,15 +127,15 @@ void test_float_limits(const T &, const char * msg)
   print_hex_val(qnan, "qnan");
   print_hex_val(snan, "snan");
 
-  BOOST_CHECK((lim::max)() > 1000);
-  BOOST_CHECK((lim::min)() > 0);
-  BOOST_CHECK((lim::min)() < 0.001);
-  BOOST_CHECK(lim::epsilon() > 0);
+  BOOST_TEST((lim::max)() > 1000);
+  BOOST_TEST((lim::min)() > 0);
+  BOOST_TEST((lim::min)() < 0.001);
+  BOOST_TEST(lim::epsilon() > 0);
 
   if(lim::is_iec559) {
-    BOOST_CHECK(static_cast<bool>(lim::has_infinity));
-    BOOST_CHECK(static_cast<bool>(lim::has_quiet_NaN));
-    BOOST_CHECK(static_cast<bool>(lim::has_signaling_NaN));
+    BOOST_TEST(static_cast<bool>(lim::has_infinity));
+    BOOST_TEST(static_cast<bool>(lim::has_quiet_NaN));
+    BOOST_TEST(static_cast<bool>(lim::has_signaling_NaN));
   } else {
     std::cout << "Does not claim IEEE conformance" << std::endl;
   }
@@ -143,8 +143,8 @@ void test_float_limits(const T &, const char * msg)
   if(lim::has_infinity) {
     // Make sure those values are not 0 or similar nonsense.
     // Infinity must compare as if larger than the maximum representable value.
-    BOOST_CHECK(infinity > (lim::max)());
-    BOOST_CHECK(-infinity < -(lim::max)());
+    BOOST_TEST(infinity > (lim::max)());
+    BOOST_TEST(-infinity < -(lim::max)());
   } else {
     std::cout << "Does not have infinity" << std::endl;
   }
@@ -153,26 +153,26 @@ void test_float_limits(const T &, const char * msg)
     // NaNs shall always compare "false" when compared for equality
     // If one of these fail, your compiler may be optimizing incorrectly,
     // or the standard library is incorrectly configured.
-    BOOST_CHECK(! (qnan == 42));
-    BOOST_CHECK(qnan != 42);
+    BOOST_TEST(! (qnan == 42));
+    BOOST_TEST(qnan != 42);
     if(lim::is_iec559)
     {
-      BOOST_CHECK(! (qnan == qnan));
-      BOOST_CHECK(qnan != qnan);
+      BOOST_TEST(! (qnan == qnan));
+      BOOST_TEST(qnan != qnan);
     }
 
     // The following tests may cause arithmetic traps.
-    // BOOST_CHECK(! (qnan < 42));
-    // BOOST_CHECK(! (qnan > 42));
-    // BOOST_CHECK(! (qnan <= 42));
-    // BOOST_CHECK(! (qnan >= 42));
+    // BOOST_TEST(! (qnan < 42));
+    // BOOST_TEST(! (qnan > 42));
+    // BOOST_TEST(! (qnan <= 42));
+    // BOOST_TEST(! (qnan >= 42));
   } else {
     std::cout << "Does not have QNaN" << std::endl;
   }
 }
 
 
-int test_main(int, char*[])
+int cpp_main(int, char*[])
 {
   test_integral_limits(bool(), "bool");
   test_integral_limits(char(), "char");
diff --git a/tools/generate.cpp b/tools/generate.cpp
index 8a8e7708..625e93f3 100644
--- a/tools/generate.cpp
+++ b/tools/generate.cpp
@@ -13,7 +13,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/test/included/prg_exec_monitor.hpp>
+#include <boost/detail/lightweight_main.hpp>
 #include <iostream>
 #include <sstream>
 #include <string>