diff --git a/bind_visitor.cpp b/bind_visitor.cpp
index 763bf94..fe6883e 100644
--- a/bind_visitor.cpp
+++ b/bind_visitor.cpp
@@ -19,18 +19,9 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
 #include <iostream>
 #include <typeinfo>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
 using namespace boost::placeholders;
 
 //
diff --git a/test/bind_and_or_test.cpp b/test/bind_and_or_test.cpp
index 7c7b6f1..d7d4952 100644
--- a/test/bind_and_or_test.cpp
+++ b/test/bind_and_or_test.cpp
@@ -18,21 +18,12 @@
 //
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 bool f( bool x )
 {
     return x;
diff --git a/test/bind_cdecl_mf_test.cpp b/test/bind_cdecl_mf_test.cpp
index 4e795e9..785e90d 100644
--- a/test/bind_cdecl_mf_test.cpp
+++ b/test/bind_cdecl_mf_test.cpp
@@ -28,18 +28,9 @@ int main()
 #define BOOST_MEM_FN_ENABLE_CDECL
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 struct X
 {
diff --git a/test/bind_const_test.cpp b/test/bind_const_test.cpp
index b52e3c3..958a9bc 100644
--- a/test/bind_const_test.cpp
+++ b/test/bind_const_test.cpp
@@ -20,18 +20,7 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_cv_test.cpp b/test/bind_cv_test.cpp
index 2c2bb8f..e6ef2f2 100644
--- a/test/bind_cv_test.cpp
+++ b/test/bind_cv_test.cpp
@@ -18,18 +18,9 @@
 //
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 struct X
 {
diff --git a/test/bind_dm2_test.cpp b/test/bind_dm2_test.cpp
index 10a5a9e..cd94617 100644
--- a/test/bind_dm2_test.cpp
+++ b/test/bind_dm2_test.cpp
@@ -18,22 +18,13 @@
 //
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
+#include <boost/core/lightweight_test.hpp>
 #include <string>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
 using namespace boost::placeholders;
 
+//
+
 struct X
 {
     int m;
diff --git a/test/bind_dm3_test.cpp b/test/bind_dm3_test.cpp
index 320ee27..899c6af 100644
--- a/test/bind_dm3_test.cpp
+++ b/test/bind_dm3_test.cpp
@@ -18,22 +18,13 @@
 //
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <utility>
 
 using namespace boost::placeholders;
 
+//
+
 int main()
 {
     typedef std::pair<int, int> pair_type;
diff --git a/test/bind_dm_test.cpp b/test/bind_dm_test.cpp
index 2369b71..08c6b5b 100644
--- a/test/bind_dm_test.cpp
+++ b/test/bind_dm_test.cpp
@@ -18,21 +18,12 @@
 //
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 struct X
 {
     int m;
diff --git a/test/bind_eq2_test.cpp b/test/bind_eq2_test.cpp
index 994225b..06ebd13 100644
--- a/test/bind_eq2_test.cpp
+++ b/test/bind_eq2_test.cpp
@@ -19,10 +19,12 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/function_equal.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 void f( int )
 {
 }
diff --git a/test/bind_eq3_test.cpp b/test/bind_eq3_test.cpp
index d947e50..7c597de 100644
--- a/test/bind_eq3_test.cpp
+++ b/test/bind_eq3_test.cpp
@@ -20,7 +20,9 @@
 #include <boost/bind/bind.hpp>
 #include <boost/function_equal.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+//
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_eq_test.cpp b/test/bind_eq_test.cpp
index 5524727..95d5e77 100644
--- a/test/bind_eq_test.cpp
+++ b/test/bind_eq_test.cpp
@@ -19,25 +19,12 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-
-#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-# include <boost/function_equal.hpp>
-#endif
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 struct X
 {
     int i_;
@@ -148,23 +135,11 @@ void fv_9(X, X, X, X, X, X, X, X, X)
 
 template<class F> void test_eq(F f1, F f2)
 {
-#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-
-    using boost::function_equal;
-
-#endif
-
     BOOST_TEST( function_equal( f1, f2 ) );
 }
 
 template<class F> void test_ne(F f1, F f2)
 {
-#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-
-    using boost::function_equal;
-
-#endif
-
     BOOST_TEST( !function_equal( f1, f2 ) );
 }
 
diff --git a/test/bind_fastcall_mf_test.cpp b/test/bind_fastcall_mf_test.cpp
index 48d4973..85406b9 100644
--- a/test/bind_fastcall_mf_test.cpp
+++ b/test/bind_fastcall_mf_test.cpp
@@ -28,18 +28,9 @@ int main()
 #define BOOST_MEM_FN_ENABLE_FASTCALL
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 struct X
 {
diff --git a/test/bind_fastcall_test.cpp b/test/bind_fastcall_test.cpp
index 3f941bd..fe49f28 100644
--- a/test/bind_fastcall_test.cpp
+++ b/test/bind_fastcall_test.cpp
@@ -28,18 +28,7 @@ int main()
 #define BOOST_BIND_ENABLE_FASTCALL
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_fn2_test.cpp b/test/bind_fn2_test.cpp
index 85ef7e3..52055c1 100644
--- a/test/bind_fn2_test.cpp
+++ b/test/bind_fn2_test.cpp
@@ -18,18 +18,9 @@
 //
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 long global_result;
 
diff --git a/test/bind_fnobj2_test.cpp b/test/bind_fnobj2_test.cpp
index deb11a0..5fc2b93 100644
--- a/test/bind_fnobj2_test.cpp
+++ b/test/bind_fnobj2_test.cpp
@@ -18,18 +18,9 @@
 //
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 struct X
 {
diff --git a/test/bind_function2_test.cpp b/test/bind_function2_test.cpp
index a281adb..f00af47 100644
--- a/test/bind_function2_test.cpp
+++ b/test/bind_function2_test.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_function_ap_test.cpp b/test/bind_function_ap_test.cpp
index 9593576..378ee21 100644
--- a/test/bind_function_ap_test.cpp
+++ b/test/bind_function_ap_test.cpp
@@ -28,7 +28,7 @@ int main()
 
 #include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 using namespace boost::placeholders;
diff --git a/test/bind_function_test.cpp b/test/bind_function_test.cpp
index 809ec01..6a92cba 100644
--- a/test/bind_function_test.cpp
+++ b/test/bind_function_test.cpp
@@ -17,19 +17,11 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-#include <boost/function.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
 #include <boost/bind/bind.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/function.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+//
 
 int f( int x )
 {
diff --git a/test/bind_fwd2_test.cpp b/test/bind_fwd2_test.cpp
index 74ac5ed..b16db55 100644
--- a/test/bind_fwd2_test.cpp
+++ b/test/bind_fwd2_test.cpp
@@ -11,7 +11,7 @@
 //
 
 #include <boost/bind/bind.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_fwd_test.cpp b/test/bind_fwd_test.cpp
index 70c3e95..e2c0ea3 100644
--- a/test/bind_fwd_test.cpp
+++ b/test/bind_fwd_test.cpp
@@ -11,7 +11,7 @@
 //
 
 #include <boost/bind/bind.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_mf2_test.cpp b/test/bind_mf2_test.cpp
index cced716..819e376 100644
--- a/test/bind_mf2_test.cpp
+++ b/test/bind_mf2_test.cpp
@@ -18,18 +18,9 @@
 //
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 struct X
 {
diff --git a/test/bind_nested_rv_test.cpp b/test/bind_nested_rv_test.cpp
index 01301b4..9b1dc46 100644
--- a/test/bind_nested_rv_test.cpp
+++ b/test/bind_nested_rv_test.cpp
@@ -13,7 +13,7 @@
 #include <boost/bind/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/function.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_not_test.cpp b/test/bind_not_test.cpp
index 6736c14..c089dde 100644
--- a/test/bind_not_test.cpp
+++ b/test/bind_not_test.cpp
@@ -18,21 +18,12 @@
 //
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 template<class F, class A1, class R> void test( F f, A1 a1, R r )
 {
     BOOST_TEST( f(a1) == r );
diff --git a/test/bind_placeholder_test.cpp b/test/bind_placeholder_test.cpp
index f646b41..feaf4ff 100644
--- a/test/bind_placeholder_test.cpp
+++ b/test/bind_placeholder_test.cpp
@@ -19,18 +19,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/bind_ref_test.cpp b/test/bind_ref_test.cpp
index 445de88..c90efca 100644
--- a/test/bind_ref_test.cpp
+++ b/test/bind_ref_test.cpp
@@ -10,10 +10,12 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 struct X
 {
     int f( int x )
diff --git a/test/bind_rel_test.cpp b/test/bind_rel_test.cpp
index 183bbe6..0b53bea 100644
--- a/test/bind_rel_test.cpp
+++ b/test/bind_rel_test.cpp
@@ -18,21 +18,12 @@
 //
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 int f( int x )
 {
     return x + x;
diff --git a/test/bind_rv_sp_test.cpp b/test/bind_rv_sp_test.cpp
index d0147c0..ce21b72 100644
--- a/test/bind_rv_sp_test.cpp
+++ b/test/bind_rv_sp_test.cpp
@@ -18,20 +18,11 @@
 //
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 
+//
+
 struct X
 {
     int v_;
diff --git a/test/bind_rvalue_test.cpp b/test/bind_rvalue_test.cpp
index 4f3644d..b86e372 100644
--- a/test/bind_rvalue_test.cpp
+++ b/test/bind_rvalue_test.cpp
@@ -19,18 +19,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_stateful_test.cpp b/test/bind_stateful_test.cpp
index b2e26e3..66b50c4 100644
--- a/test/bind_stateful_test.cpp
+++ b/test/bind_stateful_test.cpp
@@ -18,18 +18,9 @@
 //
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 class X
 {
diff --git a/test/bind_stdcall_mf_test.cpp b/test/bind_stdcall_mf_test.cpp
index 878e03e..f2bf971 100644
--- a/test/bind_stdcall_mf_test.cpp
+++ b/test/bind_stdcall_mf_test.cpp
@@ -28,18 +28,9 @@ int main()
 #define BOOST_MEM_FN_ENABLE_STDCALL
 
 #include <boost/bind/bind.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+//
 
 struct X
 {
diff --git a/test/bind_stdcall_test.cpp b/test/bind_stdcall_test.cpp
index e8b39af..2e6dc59 100644
--- a/test/bind_stdcall_test.cpp
+++ b/test/bind_stdcall_test.cpp
@@ -30,18 +30,7 @@ int main()
 #define BOOST_BIND_ENABLE_STDCALL
 
 #include <boost/bind/bind.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_test.cpp b/test/bind_test.cpp
index 9be7115..20cbd63 100644
--- a/test/bind_test.cpp
+++ b/test/bind_test.cpp
@@ -20,18 +20,7 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_type_test.cpp b/test/bind_type_test.cpp
index d824271..4b66961 100644
--- a/test/bind_type_test.cpp
+++ b/test/bind_type_test.cpp
@@ -11,7 +11,7 @@
 //
 
 #include <boost/bind/bind.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_unary_addr.cpp b/test/bind_unary_addr.cpp
index f0032d1..6ffc3ca 100644
--- a/test/bind_unary_addr.cpp
+++ b/test/bind_unary_addr.cpp
@@ -19,15 +19,7 @@
 
 #include <boost/bind/bind.hpp>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
+//
 
 class X
 {
diff --git a/test/bind_unique_ptr_test.cpp b/test/bind_unique_ptr_test.cpp
index 2042eef..434d4a8 100644
--- a/test/bind_unique_ptr_test.cpp
+++ b/test/bind_unique_ptr_test.cpp
@@ -19,7 +19,7 @@ int main()
 //
 
 #include <boost/bind/bind.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 using namespace boost::placeholders;
diff --git a/test/bind_visit_test.cpp b/test/bind_visit_test.cpp
index 25b1e39..8abfb52 100644
--- a/test/bind_visit_test.cpp
+++ b/test/bind_visit_test.cpp
@@ -17,22 +17,13 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/visit_each.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-# pragma warning(push, 3)
-#endif
-
-#include <iostream>
+#include <boost/core/lightweight_test.hpp>
 #include <typeinfo>
 
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-# pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
-
 using namespace boost::placeholders;
 
+//
+
 struct visitor
 {
     int hash;
diff --git a/test/bind_void_dm_test.cpp b/test/bind_void_dm_test.cpp
index 183fa29..f928f39 100644
--- a/test/bind_void_dm_test.cpp
+++ b/test/bind_void_dm_test.cpp
@@ -20,18 +20,7 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/bind_void_mf_test.cpp b/test/bind_void_mf_test.cpp
index 104b2fd..246e252 100644
--- a/test/bind_void_mf_test.cpp
+++ b/test/bind_void_mf_test.cpp
@@ -20,18 +20,7 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 
diff --git a/test/bind_void_test.cpp b/test/bind_void_test.cpp
index 263a3a3..37a72e0 100644
--- a/test/bind_void_test.cpp
+++ b/test/bind_void_test.cpp
@@ -20,18 +20,7 @@
 
 #include <boost/bind/bind.hpp>
 #include <boost/ref.hpp>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(push, 3)
-#endif
-
-#include <iostream>
-
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-#pragma warning(pop)
-#endif
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
diff --git a/test/placeholder_std_bind_test.cpp b/test/placeholder_std_bind_test.cpp
index 96a486a..8f65901 100644
--- a/test/placeholder_std_bind_test.cpp
+++ b/test/placeholder_std_bind_test.cpp
@@ -24,6 +24,8 @@ int main()
 
 using namespace boost::placeholders;
 
+//
+
 namespace std
 {
 
diff --git a/test/protect_test.cpp b/test/protect_test.cpp
index c4049bf..11d4219 100644
--- a/test/protect_test.cpp
+++ b/test/protect_test.cpp
@@ -9,11 +9,12 @@
 
 #include <boost/bind/protect.hpp>
 #include <boost/bind/bind.hpp>
-
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::placeholders;
 
+//
+
 int f(int x)
 {
     return x;
diff --git a/test/quick.cpp b/test/quick.cpp
index 8394427..ff29620 100644
--- a/test/quick.cpp
+++ b/test/quick.cpp
@@ -14,6 +14,8 @@
 
 using namespace boost::placeholders;
 
+//
+
 int f( int a, int b, int c )
 {
     return a + 10 * b + 100 * c;