diff --git a/include/boost/preprocessor/config/config.hpp b/include/boost/preprocessor/config/config.hpp
index fa5ca5b..89b7da7 100644
--- a/include/boost/preprocessor/config/config.hpp
+++ b/include/boost/preprocessor/config/config.hpp
@@ -70,6 +70,7 @@
 #
 # /* BOOST_PP_VARIADICS */
 #
+# define BOOST_PP_VARIADICS_MSVC 0
 # if !defined BOOST_PP_VARIADICS
 #    /* variadic support explicitly disabled for all untested compilers */
 #    if defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || defined __SUNPRO_CC || defined __HP_aCC && !defined __EDG__ || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI
@@ -79,7 +80,7 @@
 #        define BOOST_PP_VARIADICS 1
 #        define BOOST_PP_VARIADICS_MSVC 1
 #    /* Wave (C/C++), GCC (C++) */
-#    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && __GXX_EXPERIMENTAL_CXX0X__
+#    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && defined __GXX_EXPERIMENTAL_CXX0X__ && __GXX_EXPERIMENTAL_CXX0X__
 #        define BOOST_PP_VARIADICS 1
 #    /* EDG-based (C/C++), GCC (C), and unknown (C/C++) */
 #    elif !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L
diff --git a/test/facilities.cxx b/test/facilities.cxx
index d824ce7..f81b6a0 100644
--- a/test/facilities.cxx
+++ b/test/facilities.cxx
@@ -36,7 +36,7 @@ BEGIN BOOST_PP_CAT(BOOST_PP_INTERCEPT, 2) 1 == 1 END
 #define OVMAC_3(x,y,z) BOOST_PP_ADD(BOOST_PP_MUL(x,y),z)
 #define OVMAC_4(x,y,z,a) BOOST_PP_ADD(BOOST_PP_MUL(x,y),BOOST_PP_MUL(a,z))
 
-#if defined(BOOST_PP_VARIADICS_MSVC)
+#if BOOST_PP_VARIADICS_MSVC
 
 #define OVTEST(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(OVMAC_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
 
diff --git a/test/isempty.cxx b/test/isempty.cxx
index d0c3776..56bc81b 100644
--- a/test/isempty.cxx
+++ b/test/isempty.cxx
@@ -38,7 +38,7 @@
 
 #if BOOST_PP_VARIADICS
 
-#if defined(BOOST_PP_VARIADICS_MSVC) /* Testing the VC++ variadic version */
+#if BOOST_PP_VARIADICS_MSVC /* Testing the VC++ variadic version */
 
 /* INCORRECT */
 
diff --git a/test/isempty_variadic_standard_failure.cxx b/test/isempty_variadic_standard_failure.cxx
index bfbbc9d..feee25f 100644
--- a/test/isempty_variadic_standard_failure.cxx
+++ b/test/isempty_variadic_standard_failure.cxx
@@ -12,7 +12,7 @@
 # include <boost/preprocessor/facilities/is_empty.hpp>
 # include <libs/preprocessor/test/test.h>
 
-#if BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && !defined(BOOST_PP_VARIADICS_MSVC)
+#if BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && !BOOST_PP_VARIADICS_MSVC
 
 #define FUNC_GEN8(x,y) (1,2,3)
   
diff --git a/test/isempty_variadic_standard_failure2.cxx b/test/isempty_variadic_standard_failure2.cxx
index d730626..f51d497 100644
--- a/test/isempty_variadic_standard_failure2.cxx
+++ b/test/isempty_variadic_standard_failure2.cxx
@@ -12,7 +12,7 @@
 # include <boost/preprocessor/facilities/is_empty.hpp>
 # include <libs/preprocessor/test/test.h>
 
-#if BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && !defined(BOOST_PP_VARIADICS_MSVC)
+#if BOOST_PP_VARIADICS && (BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()) && !BOOST_PP_VARIADICS_MSVC
 
 #define FUNC_GEN9(x,y,z) anything