diff --git a/test/bind_cdecl_mf_test.cpp b/test/bind_cdecl_mf_test.cpp
index 785e90d8..756e8828 100644
--- a/test/bind_cdecl_mf_test.cpp
+++ b/test/bind_cdecl_mf_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/bind_fastcall_mf_test.cpp b/test/bind_fastcall_mf_test.cpp
index 85406b98..9debc4bc 100644
--- a/test/bind_fastcall_mf_test.cpp
+++ b/test/bind_fastcall_mf_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/bind_fastcall_test.cpp b/test/bind_fastcall_test.cpp
index fe49f28c..4c88c251 100644
--- a/test/bind_fastcall_test.cpp
+++ b/test/bind_fastcall_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/bind_stdcall_mf_test.cpp b/test/bind_stdcall_mf_test.cpp
index f2bf9717..4192e292 100644
--- a/test/bind_stdcall_mf_test.cpp
+++ b/test/bind_stdcall_mf_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/bind_stdcall_test.cpp b/test/bind_stdcall_test.cpp
index 2e6dc592..7acdb3ef 100644
--- a/test/bind_stdcall_test.cpp
+++ b/test/bind_stdcall_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/mem_fn_cdecl_ref_test.cpp b/test/mem_fn_cdecl_ref_test.cpp
index 94ee948d..0af0e301 100644
--- a/test/mem_fn_cdecl_ref_test.cpp
+++ b/test/mem_fn_cdecl_ref_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/mem_fn_cdecl_test.cpp b/test/mem_fn_cdecl_test.cpp
index ed5a47ce..b53de351 100644
--- a/test/mem_fn_cdecl_test.cpp
+++ b/test/mem_fn_cdecl_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/mem_fn_fastcall_ref_test.cpp b/test/mem_fn_fastcall_ref_test.cpp
index 3319d94b..0f27e3e5 100644
--- a/test/mem_fn_fastcall_ref_test.cpp
+++ b/test/mem_fn_fastcall_ref_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/mem_fn_fastcall_test.cpp b/test/mem_fn_fastcall_test.cpp
index b7a6ab30..f4fb06b0 100644
--- a/test/mem_fn_fastcall_test.cpp
+++ b/test/mem_fn_fastcall_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/mem_fn_stdcall_ref_test.cpp b/test/mem_fn_stdcall_ref_test.cpp
index 38e69fd0..a8b0c822 100644
--- a/test/mem_fn_stdcall_ref_test.cpp
+++ b/test/mem_fn_stdcall_ref_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {
diff --git a/test/mem_fn_stdcall_test.cpp b/test/mem_fn_stdcall_test.cpp
index 7f5645f3..6c8eaeae 100644
--- a/test/mem_fn_stdcall_test.cpp
+++ b/test/mem_fn_stdcall_test.cpp
@@ -1,6 +1,6 @@
 #include <boost/config.hpp>
 
-#ifndef BOOST_MSVC
+#ifndef _MSC_VER
 
 int main()
 {