diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d5a1812..172e9eb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -127,6 +127,7 @@ boost_test(TYPE run SOURCES ec_location_test4.cpp)
 boost_test(TYPE compile SOURCES constexpr_test2.cpp)
 
 boost_test(TYPE run SOURCES error_code_test3.cpp)
+boost_test(TYPE run SOURCES std_interop_test15.cpp)
 
 # result
 
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 3a02003..d930c02 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -155,6 +155,7 @@ run ec_location_test4.cpp ;
 compile constexpr_test2.cpp ;
 
 run error_code_test3.cpp ;
+run std_interop_test15.cpp ;
 
 # result
 
diff --git a/test/std_interop_test15.cpp b/test/std_interop_test15.cpp
new file mode 100644
index 0000000..87f64dc
--- /dev/null
+++ b/test/std_interop_test15.cpp
@@ -0,0 +1,79 @@
+// Copyright 2021, 2022 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/system/error_code.hpp>
+#include <boost/system/error_condition.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <boost/config/pragma_message.hpp>
+#include <boost/config.hpp>
+
+#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
+
+BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
+int main() {}
+
+#else
+
+#include <system_error>
+
+namespace sys = boost::system;
+
+enum my_errc
+{
+    enomem_c = ENOMEM
+};
+
+enum my_errn
+{
+    enomem_n = ENOMEM
+};
+
+namespace std {
+
+template<> struct is_error_code_enum<my_errc>
+{
+    static const bool value = true;
+};
+
+template<> struct is_error_condition_enum<my_errn>
+{
+    static const bool value = true;
+};
+
+} // namespace std
+
+std::error_code make_error_code( my_errc e )
+{
+    return std::error_code( e, std::generic_category() );
+}
+
+std::error_condition make_error_condition( my_errn e )
+{
+    return std::error_condition( e, std::generic_category() );
+}
+
+int main()
+{
+    sys::error_code ec = make_error_code( sys::errc::not_enough_memory );
+    sys::error_condition en( sys::errc::not_enough_memory );
+
+    BOOST_TEST_EQ( ec, en );
+    BOOST_TEST_EQ( en, ec );
+
+    BOOST_TEST_EQ( ec, enomem_c );
+    BOOST_TEST_EQ( enomem_c, ec );
+
+    BOOST_TEST_EQ( ec, enomem_n );
+    BOOST_TEST_EQ( enomem_n, ec );
+
+    // BOOST_TEST_EQ( en, enomem_c );
+    // BOOST_TEST_EQ( enomem_c, en );
+
+    // BOOST_TEST_EQ( en, enomem_n );
+    // BOOST_TEST_EQ( enomem_n, en );
+
+    return boost::report_errors();
+}
+
+#endif