diff --git a/test/construct_from_tuple_cx.cpp b/test/construct_from_tuple_cx.cpp
index 5c557d1..30abdbd 100644
--- a/test/construct_from_tuple_cx.cpp
+++ b/test/construct_from_tuple_cx.cpp
@@ -16,7 +16,7 @@
 
 // Technically std::tuple isn't constexpr enabled in C++11, but it works with libstdc++
 
-#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( defined( _LIBCPP_VERSION ) && __cplusplus < 201400L )
+#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L )
 
 int main() {}
 
diff --git a/test/mp_for_each.cpp b/test/mp_for_each.cpp
index 4f2cfe3..3d41d72 100644
--- a/test/mp_for_each.cpp
+++ b/test/mp_for_each.cpp
@@ -46,7 +46,7 @@ int main()
 
     BOOST_TEST_EQ( (mp_for_each<std::pair<int, short>>( F{0} ).s), 12 );
 
-#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( defined( _LIBCPP_VERSION ) && __cplusplus < 201400L )
+#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L )
 #else
 
     static_assert( mp_for_each<mp_list<>>( 11 ) == 11, "mp_for_each<mp_list<>>( 11 ) == 11" );
diff --git a/test/tuple_apply_cx.cpp b/test/tuple_apply_cx.cpp
index 40201ac..576a7b3 100644
--- a/test/tuple_apply_cx.cpp
+++ b/test/tuple_apply_cx.cpp
@@ -16,7 +16,7 @@
 
 // Technically std::tuple isn't constexpr enabled in C++11, but it works with libstdc++
 
-#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( defined( _LIBCPP_VERSION ) && __cplusplus < 201400L )
+#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L )
 
 int main() {}
 
diff --git a/test/tuple_for_each_cx.cpp b/test/tuple_for_each_cx.cpp
index 266fffd..ff1d043 100644
--- a/test/tuple_for_each_cx.cpp
+++ b/test/tuple_for_each_cx.cpp
@@ -16,7 +16,7 @@
 
 // Technically std::tuple isn't constexpr enabled in C++11, but it works with libstdc++
 
-#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( defined( _LIBCPP_VERSION ) && __cplusplus < 201400L )
+#if defined( BOOST_NO_CXX11_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L )
 
 int main() {}