diff --git a/test/array.cpp b/test/array.cpp
index 1cbed04..99700c7 100755
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -8,17 +8,17 @@
 // For more information, see http://www.boost.org/libs/assign/
 //
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x564) )
 #  pragma warn -8091 // supress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
 
 #include <boost/assign/list_of.hpp>
+#include <boost/array.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
-#include <boost/array.hpp>
 #include <iostream>
 #include <algorithm>
 #include <iterator>
diff --git a/test/basic.cpp b/test/basic.cpp
index 89950e8..97599de 100755
--- a/test/basic.cpp
+++ b/test/basic.cpp
@@ -8,7 +8,7 @@
 // For more information, see http://www.boost.org/libs/assign/
 //
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // supress warning in Boost.Test
diff --git a/test/email_example.cpp b/test/email_example.cpp
index f6f7ba8..9656235 100755
--- a/test/email_example.cpp
+++ b/test/email_example.cpp
@@ -9,7 +9,7 @@
 //
 
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // supress warning in Boost.Test
diff --git a/test/list_inserter.cpp b/test/list_inserter.cpp
index 1d8f1e8..aa44bc5 100755
--- a/test/list_inserter.cpp
+++ b/test/list_inserter.cpp
@@ -8,7 +8,7 @@
 // For more information, see http://www.boost.org/libs/assign/
 //
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // supress warning in Boost.Test
diff --git a/test/list_of.cpp b/test/list_of.cpp
index 2181db3..0046c87 100755
--- a/test/list_of.cpp
+++ b/test/list_of.cpp
@@ -9,7 +9,7 @@
 //
 
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // supress warning in Boost.Test
diff --git a/test/list_of_workaround.cpp b/test/list_of_workaround.cpp
index 2a9beb7..cb4f02c 100755
--- a/test/list_of_workaround.cpp
+++ b/test/list_of_workaround.cpp
@@ -9,7 +9,7 @@
 //
 
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // supress warning in Boost.Test
diff --git a/test/my_vector_example.cpp b/test/my_vector_example.cpp
index 2af1a97..966468c 100755
--- a/test/my_vector_example.cpp
+++ b/test/my_vector_example.cpp
@@ -9,7 +9,7 @@
 //
 
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // supress warning in Boost.Test
diff --git a/test/std.cpp b/test/std.cpp
index 77ea679..8344cd8 100755
--- a/test/std.cpp
+++ b/test/std.cpp
@@ -9,7 +9,7 @@
 //
 
 
-#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // supress warning in Boost.Test