diff --git a/test/error_code_test.cpp b/test/error_code_test.cpp
index 3840823..330ddf0 100644
--- a/test/error_code_test.cpp
+++ b/test/error_code_test.cpp
@@ -9,14 +9,7 @@
 
 //----------------------------------------------------------------------------// 
 
-//  VC++ 8.0 warns on usage of certain Standard Library and API functions that
-//  can cause buffer overruns or other possible security issues if misused.
-//  See http://msdn.microsoft.com/msdnmag/issues/05/05/SafeCandC/default.aspx
-//  But the wording of the warning is misleading and unsettling, there are no
-//  portable alternative functions, and VC++ 8.0's own libraries use the
-//  functions in question. So turn off the warnings.
-#define _CRT_SECURE_NO_DEPRECATE
-#define _SCL_SECURE_NO_DEPRECATE
+#include <boost/config/warning_disable.hpp>
 
 #include <boost/test/minimal.hpp>
 #include <boost/system/error_code.hpp>
diff --git a/test/header_only_test.cpp b/test/header_only_test.cpp
index 0f4e17b..20d6179 100644
--- a/test/header_only_test.cpp
+++ b/test/header_only_test.cpp
@@ -9,14 +9,7 @@
 
 //----------------------------------------------------------------------------// 
 
-//  VC++ 8.0 warns on usage of certain Standard Library and API functions that
-//  can cause buffer overruns or other possible security issues if misused.
-//  See http://msdn.microsoft.com/msdnmag/issues/05/05/SafeCandC/default.aspx
-//  But the wording of the warning is misleading and unsettling, there are no
-//  portable altersystem functions, and VC++ 8.0's own libraries use the
-//  functions in question. So turn off the warnings.
-#define _CRT_SECURE_NO_DEPRECATE
-#define _SCL_SECURE_NO_DEPRECATE
+#include <boost/config/warning_disable.hpp>
 
 #define BOOST_ERROR_CODE_HEADER_ONLY
 
diff --git a/test/system_error_test.cpp b/test/system_error_test.cpp
index 4cbdbd0..d49ced4 100644
--- a/test/system_error_test.cpp
+++ b/test/system_error_test.cpp
@@ -9,14 +9,7 @@
 
 //----------------------------------------------------------------------------// 
 
-//  VC++ 8.0 warns on usage of certain Standard Library and API functions that
-//  can cause buffer overruns or other possible security issues if misused.
-//  See http://msdn.microsoft.com/msdnmag/issues/05/05/SafeCandC/default.aspx
-//  But the wording of the warning is misleading and unsettling, there are no
-//  portable alternative functions, and VC++ 8.0's own libraries use the
-//  functions in question. So turn off the warnings.
-#define _CRT_SECURE_NO_DEPRECATE
-#define _SCL_SECURE_NO_DEPRECATE
+#include <boost/config/warning_disable.hpp>
 
 #include <boost/test/minimal.hpp>
 #include <boost/system/system_error.hpp>