diff --git a/test/algorithm_test.cpp b/test/algorithm_test.cpp
index d0adbc0..d2287e0 100644
--- a/test/algorithm_test.cpp
+++ b/test/algorithm_test.cpp
@@ -16,8 +16,7 @@
 
 // test using BLL and boost::function
 
-//#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
-#include <boost/test/test_tools.hpp>
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/bind.hpp"
diff --git a/test/bind_tests_advanced.cpp b/test/bind_tests_advanced.cpp
index 41f2843..8855cab 100644
--- a/test/bind_tests_advanced.cpp
+++ b/test/bind_tests_advanced.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/bind.hpp"
diff --git a/test/bind_tests_simple.cpp b/test/bind_tests_simple.cpp
index e3d719c..74a9674 100644
--- a/test/bind_tests_simple.cpp
+++ b/test/bind_tests_simple.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/bind.hpp"
 
diff --git a/test/bind_tests_simple_f_refs.cpp b/test/bind_tests_simple_f_refs.cpp
index eafce33..5127027 100644
--- a/test/bind_tests_simple_f_refs.cpp
+++ b/test/bind_tests_simple_f_refs.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/bind.hpp"
 
diff --git a/test/bll_and_function.cpp b/test/bll_and_function.cpp
index 1f1f31c..5d4f117 100644
--- a/test/bll_and_function.cpp
+++ b/test/bll_and_function.cpp
@@ -16,8 +16,7 @@
 
 // test using BLL and boost::function
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/lambda.hpp"
 
diff --git a/test/cast_test.cpp b/test/cast_test.cpp
index 1c6cec8..632f964 100644
--- a/test/cast_test.cpp
+++ b/test/cast_test.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 
 #include "boost/lambda/lambda.hpp"
diff --git a/test/constructor_tests.cpp b/test/constructor_tests.cpp
index fd0179f..6269c8e 100644
--- a/test/constructor_tests.cpp
+++ b/test/constructor_tests.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 
 #include "boost/lambda/lambda.hpp"
diff --git a/test/control_structures.cpp b/test/control_structures.cpp
index 5cfdaef..ca2172b 100644
--- a/test/control_structures.cpp
+++ b/test/control_structures.cpp
@@ -16,8 +16,7 @@
 
 // -----------------------------------------------------------------------
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/if.hpp"
diff --git a/test/exception_test.cpp b/test/exception_test.cpp
index e5b9dd4..a5ab7a0 100644
--- a/test/exception_test.cpp
+++ b/test/exception_test.cpp
@@ -16,8 +16,7 @@
 
 // -----------------------------------------------------------------------
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/lambda.hpp"
 
diff --git a/test/extending_rt_traits.cpp b/test/extending_rt_traits.cpp
index 8f2577d..094f7c6 100644
--- a/test/extending_rt_traits.cpp
+++ b/test/extending_rt_traits.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/bind.hpp"
 #include "boost/lambda/lambda.hpp"
diff --git a/test/is_instance_of_test.cpp b/test/is_instance_of_test.cpp
index 97a502f..d5c0de8 100644
--- a/test/is_instance_of_test.cpp
+++ b/test/is_instance_of_test.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
  
 
 #include "boost/lambda/detail/is_instance_of.hpp"
diff --git a/test/member_pointer_test.cpp b/test/member_pointer_test.cpp
index 4274076..0eedf04 100644
--- a/test/member_pointer_test.cpp
+++ b/test/member_pointer_test.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 
 #include "boost/lambda/lambda.hpp"
diff --git a/test/operator_tests_simple.cpp b/test/operator_tests_simple.cpp
index 8fe943d..8da8b75 100644
--- a/test/operator_tests_simple.cpp
+++ b/test/operator_tests_simple.cpp
@@ -17,8 +17,8 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/lambda.hpp"
 
diff --git a/test/phoenix_control_structures.cpp b/test/phoenix_control_structures.cpp
index 118f125..4afe40f 100644
--- a/test/phoenix_control_structures.cpp
+++ b/test/phoenix_control_structures.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 #include "boost/lambda/lambda.hpp"
 #include "boost/lambda/if.hpp"
diff --git a/test/switch_construct.cpp b/test/switch_construct.cpp
index 4c758e5..7afc74b 100644
--- a/test/switch_construct.cpp
+++ b/test/switch_construct.cpp
@@ -17,8 +17,7 @@
 // -----------------------------------------------------------------------
 
 
-#define BOOST_INCLUDE_MAIN  // for testing, include rather than link
-#include <boost/test/test_tools.hpp>    // see "Header Implementation Option"
+#include <boost/test/minimal.hpp>    // see "Header Implementation Option"
 
 
 #include "boost/lambda/lambda.hpp"