diff --git a/test/cpp_ctti_type_name_parser_lib.cpp b/test/cpp_ctti_type_name_parser_lib.cpp
index 392f0788..89947f0e 100644
--- a/test/cpp_ctti_type_name_parser_lib.cpp
+++ b/test/cpp_ctti_type_name_parser_lib.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
 #include <boost/dll/config.hpp>
 #include <string>
diff --git a/test/cpp_import_class_test.cpp b/test/cpp_import_class_test.cpp
index 97a79a53..aebeedfc 100644
--- a/test/cpp_import_class_test.cpp
+++ b/test/cpp_import_class_test.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
 #include "../example/b2_workarounds.hpp"
 
diff --git a/test/cpp_import_test.cpp b/test/cpp_import_test.cpp
index a32df870..85f38cb3 100644
--- a/test/cpp_import_test.cpp
+++ b/test/cpp_import_test.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
 #include "../example/b2_workarounds.hpp"
 
diff --git a/test/cpp_load_test.cpp b/test/cpp_load_test.cpp
index b073107b..07474d9f 100644
--- a/test/cpp_load_test.cpp
+++ b/test/cpp_load_test.cpp
@@ -10,12 +10,9 @@
 #include <boost/config.hpp>
 #include <boost/predef.h>
 
-#if (__cplusplus >= 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)
-// Make sure that it at least compiles
-#  include <boost/dll/smart_library.hpp>
-#endif
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
-#if (__cplusplus >= 201402L) || (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14,0,0))
+#  include <boost/dll/smart_library.hpp>
 
 #include "../example/b2_workarounds.hpp"
 
diff --git a/test/cpp_mangle_test.cpp b/test/cpp_mangle_test.cpp
index 9c4b54bb..7542ea6d 100644
--- a/test/cpp_mangle_test.cpp
+++ b/test/cpp_mangle_test.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
 #include "../example/b2_workarounds.hpp"
 
diff --git a/test/cpp_test_library.cpp b/test/cpp_test_library.cpp
index f0bebeb6..0c5544be 100644
--- a/test/cpp_test_library.cpp
+++ b/test/cpp_test_library.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
 #include <boost/dll/config.hpp>
 #include <boost/variant.hpp>
diff --git a/test/ctti_type_name_parser_test.cpp b/test/ctti_type_name_parser_test.cpp
index d374608a..4a5e6c50 100644
--- a/test/ctti_type_name_parser_test.cpp
+++ b/test/ctti_type_name_parser_test.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 #include "../example/b2_workarounds.hpp"
 
 #include <boost/core/lightweight_test.hpp>
diff --git a/test/link.hpp b/test/link.hpp
index de03d24a..3005a74b 100644
--- a/test/link.hpp
+++ b/test/link.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
 #include <boost/dll/smart_library.hpp>
 #include <boost/dll/import_mangled.hpp>
diff --git a/test/template_method_linux_test.cpp b/test/template_method_linux_test.cpp
index 8dde1f66..bd025057 100644
--- a/test/template_method_linux_test.cpp
+++ b/test/template_method_linux_test.cpp
@@ -6,7 +6,7 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
-#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#if (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L)
 
 #include <boost/dll/smart_library.hpp>
 #include <boost/dll/import_mangled.hpp>