diff --git a/test/addressof_fn_test.cpp b/test/addressof_fn_test.cpp
index 0d043bf..594e06e 100644
--- a/test/addressof_fn_test.cpp
+++ b/test/addressof_fn_test.cpp
@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/utility/addressof.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 void f0()
diff --git a/test/addressof_np_test.cpp b/test/addressof_np_test.cpp
index 9e155d4..6e8f706 100644
--- a/test/addressof_np_test.cpp
+++ b/test/addressof_np_test.cpp
@@ -7,7 +7,7 @@
 //
 
 #include <boost/utility/addressof.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>
 
 #if defined( BOOST_NO_CXX11_NULLPTR )
diff --git a/test/addressof_test.cpp b/test/addressof_test.cpp
index 9619cc3..bf75aca 100644
--- a/test/addressof_test.cpp
+++ b/test/addressof_test.cpp
@@ -20,7 +20,7 @@
 #pragma warning(pop)
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 template<class T> void scalar_test( T * = 0 )
 {
diff --git a/test/addressof_test2.cpp b/test/addressof_test2.cpp
index b1c36f8..3ad48f4 100644
--- a/test/addressof_test2.cpp
+++ b/test/addressof_test2.cpp
@@ -22,7 +22,7 @@
 #pragma warning(pop)
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 template<class T> void scalar_test( T * = 0 )
 {
diff --git a/test/eif_constructors.cpp b/test/eif_constructors.cpp
index ea82b40..6314c85 100644
--- a/test/eif_constructors.cpp
+++ b/test/eif_constructors.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;
diff --git a/test/eif_dummy_arg_disambiguation.cpp b/test/eif_dummy_arg_disambiguation.cpp
index e72b158..ab65f4f 100644
--- a/test/eif_dummy_arg_disambiguation.cpp
+++ b/test/eif_dummy_arg_disambiguation.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;
diff --git a/test/eif_lazy.cpp b/test/eif_lazy.cpp
index 029eca5..fdb37e3 100644
--- a/test/eif_lazy.cpp
+++ b/test/eif_lazy.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if_c;
 using boost::lazy_enable_if_c;
diff --git a/test/eif_lazy_test.cpp b/test/eif_lazy_test.cpp
index 6077759..905d0a9 100644
--- a/test/eif_lazy_test.cpp
+++ b/test/eif_lazy_test.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::lazy_enable_if;
 using boost::lazy_disable_if;
diff --git a/test/eif_member_templates.cpp b/test/eif_member_templates.cpp
index 2f1eeb2..5452733 100644
--- a/test/eif_member_templates.cpp
+++ b/test/eif_member_templates.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;
diff --git a/test/eif_namespace_disambiguation.cpp b/test/eif_namespace_disambiguation.cpp
index d190ee2..d5589ae 100644
--- a/test/eif_namespace_disambiguation.cpp
+++ b/test/eif_namespace_disambiguation.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::is_arithmetic;
diff --git a/test/eif_no_disambiguation.cpp b/test/eif_no_disambiguation.cpp
index 385451b..3853cbf 100644
--- a/test/eif_no_disambiguation.cpp
+++ b/test/eif_no_disambiguation.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::is_arithmetic;
diff --git a/test/eif_partial_specializations.cpp b/test/eif_partial_specializations.cpp
index c323494..6940eca 100644
--- a/test/eif_partial_specializations.cpp
+++ b/test/eif_partial_specializations.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if_has_type;
 using boost::enable_if_c;
diff --git a/test/explicit_operator_bool_noexcept.cpp b/test/explicit_operator_bool_noexcept.cpp
index c645cca..d4b69eb 100644
--- a/test/explicit_operator_bool_noexcept.cpp
+++ b/test/explicit_operator_bool_noexcept.cpp
@@ -18,7 +18,7 @@
 
 #if !defined(BOOST_NO_CXX11_NOEXCEPT)
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/utility/explicit_operator_bool.hpp>
 
 namespace {
diff --git a/test/lightweight_test_fail.cpp b/test/lightweight_test_fail.cpp
index ec329b3..f61ead4 100644
--- a/test/lightweight_test_fail.cpp
+++ b/test/lightweight_test_fail.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/lightweight_test_fail2.cpp b/test/lightweight_test_fail2.cpp
index dcab724..606e80d 100644
--- a/test/lightweight_test_fail2.cpp
+++ b/test/lightweight_test_fail2.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/lightweight_test_fail3.cpp b/test/lightweight_test_fail3.cpp
index 1e20842..0e2b3d9 100644
--- a/test/lightweight_test_fail3.cpp
+++ b/test/lightweight_test_fail3.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/lightweight_test_fail4.cpp b/test/lightweight_test_fail4.cpp
index 492699a..7baa4e1 100644
--- a/test/lightweight_test_fail4.cpp
+++ b/test/lightweight_test_fail4.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {
diff --git a/test/lightweight_test_fail5.cpp b/test/lightweight_test_fail5.cpp
index 5cc4659..910fd17 100644
--- a/test/lightweight_test_fail5.cpp
+++ b/test/lightweight_test_fail5.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/lightweight_test_fail6.cpp b/test/lightweight_test_fail6.cpp
index 10544ab..f73a6df 100644
--- a/test/lightweight_test_fail6.cpp
+++ b/test/lightweight_test_fail6.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/lightweight_test_test.cpp b/test/lightweight_test_test.cpp
index bfef152..47821c1 100644
--- a/test/lightweight_test_test.cpp
+++ b/test/lightweight_test_test.cpp
@@ -9,7 +9,7 @@
 //
 
 #include <vector>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {
diff --git a/test/ref_ct_test.cpp b/test/ref_ct_test.cpp
index 731d62d..7e97957 100644
--- a/test/ref_ct_test.cpp
+++ b/test/ref_ct_test.cpp
@@ -9,7 +9,7 @@
 #include <boost/ref.hpp>
 #include <boost/core/is_same.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace {
 
diff --git a/test/ref_fn_test.cpp b/test/ref_fn_test.cpp
index aec54e8..be13824 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()
diff --git a/test/ref_test.cpp b/test/ref_test.cpp
index a8f5bd7..6251b74 100644
--- a/test/ref_test.cpp
+++ b/test/ref_test.cpp
@@ -7,7 +7,7 @@
 // see 'ref_ct_test.cpp' for compile-time part
 
 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace {
 using namespace boost;
diff --git a/test/sp_typeinfo_test.cpp b/test/sp_typeinfo_test.cpp
index ae98c2c..95557f6 100644
--- a/test/sp_typeinfo_test.cpp
+++ b/test/sp_typeinfo_test.cpp
@@ -11,7 +11,7 @@
 #define BOOST_ALLOW_DEPRECATED_HEADERS
 
 #include <boost/detail/sp_typeinfo.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 
 int main()