diff --git a/include/boost/system.hpp b/include/boost/system.hpp
index dcb17b0..ec2cb6e 100644
--- a/include/boost/system.hpp
+++ b/include/boost/system.hpp
@@ -9,10 +9,6 @@
 
 #include <boost/system/error_code.hpp>
 #include <boost/system/system_error.hpp>
-#include <boost/config.hpp>
-
-#if (__cplusplus >= 201103L) && !(defined(BOOST_GCC) && BOOST_GCC < 40800) || (defined(_MSC_VER) && _MSC_VER >= 1900)
-# include <boost/system/result.hpp>
-#endif
+#include <boost/system/result.hpp>
 
 #endif // #ifndef BOOST_SYSTEM_HPP_INCLUDED
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2f2f53d..f573d9a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -138,8 +138,6 @@ boost_test(TYPE run SOURCES std_interop_test16.cpp)
 
 # result
 
-set(BOOST_TEST_COMPILE_FEATURES cxx_std_11)
-
 boost_test(TYPE run SOURCES result_default_construct.cpp)
 boost_test(TYPE run SOURCES result_value_construct.cpp)
 boost_test(TYPE run SOURCES result_error_construct.cpp)
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 984e54c..3ba33f0 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -168,44 +168,40 @@ run std_interop_test16.cpp ;
 
 # result
 
-import ../../config/checks/config : requires ;
-
-CPP11 = [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_constexpr cxx11_noexcept ] <toolset>gcc-4.7:<build>no ;
-
-run result_default_construct.cpp : : : $(CPP11) ;
-run result_value_construct.cpp : : : $(CPP11) ;
-run result_error_construct.cpp : : : $(CPP11) ;
-run result_copy_construct.cpp : : : $(CPP11) ;
-run result_move_construct.cpp : : : $(CPP11) ;
-run result_copy_assign.cpp : : : $(CPP11) ;
-run result_move_assign.cpp : : : $(CPP11) ;
-run result_value_access.cpp : : : $(CPP11) ;
-run result_error_access.cpp : : : $(CPP11) ;
-run result_swap.cpp : : : $(CPP11) <toolset>gcc-10:<cxxflags>"-Wno-maybe-uninitialized" ;
-run result_eq.cpp : : : $(CPP11) ;
-run result_range_for.cpp : : : $(CPP11) ;
-run result_value_construct2.cpp : : : $(CPP11) ;
-run result_error_construct2.cpp : : : $(CPP11) ;
-run result_errc_construct.cpp : : : $(CPP11) ;
-run result_convert_construct.cpp : : : $(CPP11) ;
-run result_typedefs.cpp : : : $(CPP11) ;
-run result_value_construct3.cpp : : : $(CPP11) ;
-run result_error_construct3.cpp : : : $(CPP11) ;
-run result_emplace.cpp : : : $(CPP11) ;
-run result_error_construct4.cpp : : : $(CPP11) ;
-run result_value_construct4.cpp : : : $(CPP11) ;
-run result_value_construct5.cpp : : : $(CPP11) ;
-run result_error_move.cpp : : : $(CPP11) ;
-run result_value_construct6.cpp : : : $(CPP11) ;
-run result_value_construct7.cpp : : : $(CPP11) ;
-run result_error_construct5.cpp : : : $(CPP11) ;
-run result_or_value.cpp : : : $(CPP11) ;
-compile-fail result_or_value_fail.cpp : $(CPP11) ;
-compile-fail result_or_value_fail2.cpp : $(CPP11) ;
-run result_or_fn0v.cpp : : : $(CPP11) ;
-run result_or_fn0r.cpp : : : $(CPP11) ;
-run result_and_fn1v.cpp : : : $(CPP11) ;
-run result_and_fn1r.cpp : : : $(CPP11) ;
-run result_and_eq_fn1v.cpp : : : $(CPP11) ;
-run result_and_eq_fn1r.cpp : : : $(CPP11) ;
-run result_in_place_use.cpp : : : $(CPP11) ;
+run result_default_construct.cpp ;
+run result_value_construct.cpp ;
+run result_error_construct.cpp ;
+run result_copy_construct.cpp ;
+run result_move_construct.cpp ;
+run result_copy_assign.cpp ;
+run result_move_assign.cpp ;
+run result_value_access.cpp ;
+run result_error_access.cpp ;
+run result_swap.cpp : : : <toolset>gcc-10:<cxxflags>"-Wno-maybe-uninitialized" ;
+run result_eq.cpp ;
+run result_range_for.cpp ;
+run result_value_construct2.cpp ;
+run result_error_construct2.cpp ;
+run result_errc_construct.cpp ;
+run result_convert_construct.cpp ;
+run result_typedefs.cpp ;
+run result_value_construct3.cpp ;
+run result_error_construct3.cpp ;
+run result_emplace.cpp ;
+run result_error_construct4.cpp ;
+run result_value_construct4.cpp ;
+run result_value_construct5.cpp ;
+run result_error_move.cpp ;
+run result_value_construct6.cpp ;
+run result_value_construct7.cpp ;
+run result_error_construct5.cpp ;
+run result_or_value.cpp ;
+compile-fail result_or_value_fail.cpp ;
+compile-fail result_or_value_fail2.cpp ;
+run result_or_fn0v.cpp ;
+run result_or_fn0r.cpp ;
+run result_and_fn1v.cpp ;
+run result_and_fn1r.cpp ;
+run result_and_eq_fn1v.cpp ;
+run result_and_eq_fn1r.cpp ;
+run result_in_place_use.cpp ;