diff --git a/doc/tests.xml b/doc/tests.xml
index 3a34722..6eeb45c 100644
--- a/doc/tests.xml
+++ b/doc/tests.xml
@@ -12,19 +12,16 @@
   </run-test>
 
   <run-test filename="allocator_test.cpp">
-    <lib>../../../libs/test/build/boost_test_exec_monitor</lib>
     <purpose><para>Test the use of custom allocators.</para></purpose>
     <if-fails><para>Allocators are ignored by the implementation.</para></if-fails>
   </run-test>
 
   <run-test filename="stateless_test.cpp">
-    <lib>../../../libs/test/build/boost_test_exec_monitor</lib>
     <purpose><para>Test the optimization of stateless function objects in the Boost.Function library.</para></purpose>
     <if-fails><para>The exception-safety and performance guarantees given for stateless function objects may not be met by the implementation.</para></if-fails>
   </run-test>
 
   <run-test filename="lambda_test.cpp">
-    <lib>../../../libs/test/build/boost_test_exec_monitor</lib>
     <purpose><para>Test the interaction between Boost.Function and Boost.Lambda.</para></purpose>
     <if-fails><para>Either Boost.Lambda does not work on the platform, or Boost.Function cannot safely be applied without the use of <functionname>boost::unlambda</functionname>.</para></if-fails>
   </run-test>
diff --git a/test/Jamfile b/test/Jamfile
index 789d77e..b5eafb1 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -29,11 +29,11 @@ DEPENDS all : test ;
 
   [ run libs/function/test/function_n_test.cpp :  :  :  :  ]
 
-  [ run libs/function/test/allocator_test.cpp <lib>../../../libs/test/build/boost_test_exec_monitor :  :  :  :  ]
+  [ run libs/function/test/allocator_test.cpp :  :  :  :  ]
 
-  [ run libs/function/test/stateless_test.cpp <lib>../../../libs/test/build/boost_test_exec_monitor :  :  :  :  ]
+  [ run libs/function/test/stateless_test.cpp :  :  :  :  ]
 
-  [ run libs/function/test/lambda_test.cpp <lib>../../../libs/test/build/boost_test_exec_monitor :  :  :  :  ]
+  [ run libs/function/test/lambda_test.cpp :  :  :  :  ]
 
   [ compile-fail libs/function/test/function_test_fail1.cpp :  :  :  :  ]
 
diff --git a/test/allocator_test.cpp b/test/allocator_test.cpp
index 97a86a1..12fa448 100644
--- a/test/allocator_test.cpp
+++ b/test/allocator_test.cpp
@@ -7,8 +7,7 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/test/minimal.hpp>
 #include <cassert>
 #include <functional>
 #include <boost/function.hpp>
diff --git a/test/function_test_fail1.cpp b/test/function_test_fail1.cpp
index 247adc2..bd933b3 100644
--- a/test/function_test_fail1.cpp
+++ b/test/function_test_fail1.cpp
@@ -7,8 +7,7 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/test/minimal.hpp>
 #include <boost/function.hpp>
 
 using namespace std;
diff --git a/test/function_test_fail2.cpp b/test/function_test_fail2.cpp
index 9a79465..0038b31 100644
--- a/test/function_test_fail2.cpp
+++ b/test/function_test_fail2.cpp
@@ -7,8 +7,7 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/test/minimal.hpp>
 #include <boost/function.hpp>
 
 using namespace std;
diff --git a/test/lambda_test.cpp b/test/lambda_test.cpp
index 87da7d7..89be06c 100644
--- a/test/lambda_test.cpp
+++ b/test/lambda_test.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <boost/test/test_tools.hpp>
+#include <boost/test/minimal.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>
 #include <boost/function.hpp>
diff --git a/test/stateless_test.cpp b/test/stateless_test.cpp
index 1eae073..54859e7 100644
--- a/test/stateless_test.cpp
+++ b/test/stateless_test.cpp
@@ -7,8 +7,7 @@
 
 // For more information, see http://www.boost.org
 
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#include <boost/test/minimal.hpp>
 #include <boost/function.hpp>
 #include <stdexcept>