diff --git a/test/bind_cdecl_mf_test.cpp b/test/bind_cdecl_mf_test.cpp
index 785e90d..756e882 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 85406b9..9debc4b 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 fe49f28..4c88c25 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 f2bf971..4192e29 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 2e6dc59..7acdb3e 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 94ee948..0af0e30 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 ed5a47c..b53de35 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 3319d94..0f27e3e 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 b7a6ab3..f4fb06b 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 38e69fd..a8b0c82 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 7f5645f..6c8eaea 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()
 {