diff --git a/test/mem_fn_dm_test.cpp b/test/mem_fn_dm_test.cpp
index 88fe428d..d958ef0a 100644
--- a/test/mem_fn_dm_test.cpp
+++ b/test/mem_fn_dm_test.cpp
@@ -18,18 +18,7 @@
 //
 
 #include <boost/mem_fn.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>
 
 struct X
 {
diff --git a/test/mem_fn_eq_test.cpp b/test/mem_fn_eq_test.cpp
index 544d6ff4..7611a9a1 100644
--- a/test/mem_fn_eq_test.cpp
+++ b/test/mem_fn_eq_test.cpp
@@ -18,18 +18,7 @@
 //
 
 #include <boost/mem_fn.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>
 
 struct X
 {
diff --git a/test/mem_fn_ref_test.cpp b/test/mem_fn_ref_test.cpp
index be989414..08382b8d 100644
--- a/test/mem_fn_ref_test.cpp
+++ b/test/mem_fn_ref_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/mem_fn.hpp>
 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/mem_fn_unary_addr_test.cpp b/test/mem_fn_unary_addr_test.cpp
index cd632391..99160a45 100644
--- a/test/mem_fn_unary_addr_test.cpp
+++ b/test/mem_fn_unary_addr_test.cpp
@@ -1,5 +1,4 @@
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
 
 #if defined(BOOST_MSVC)
 #pragma warning(disable: 4786)  // identifier truncated in debug info
@@ -19,17 +18,8 @@
 //
 
 #include <boost/mem_fn.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
-
 unsigned int hash = 0;
 
 struct X
@@ -83,20 +73,11 @@ template<class T> class Y
     }
 };
 
-#if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) )
-namespace boost
-{
-#endif
-
 template<class T> T * get_pointer( Y< T > const & y )
 {
     return y.get();
 }
 
-#if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) )
-} // namespace boost
-#endif
-
 int detect_errors(bool x)
 {
     if( x )
diff --git a/test/ref_fn_test.cpp b/test/ref_fn_test.cpp
index aec54e82..be13824c 100644
--- a/test/ref_fn_test.cpp
+++ b/test/ref_fn_test.cpp
@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 void f0()