diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 3fb218d..55e41c0 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -8,6 +8,7 @@
 # See library home page at http://www.boost.org/libs/system
 
 import testing ;
+import os ;
 
 project
     : requirements
@@ -75,6 +76,16 @@ project
       return $(result) ;
    }
 
+if [ os.environ UBSAN ]
+{
+   rule system-run ( sources + )
+   {
+      # The 03/11 tests are ODR violations, no point running them under -fsanitize=undefined
+      return [ system-run- $(sources) ] ;
+   }
+}
+else
+{
    rule system-run ( sources + )
    {
       local result = [ system-run- $(sources) ] ;
@@ -89,6 +100,7 @@ project
 
       return $(result) ;
    }
+}
 
    test-suite "system"
        : [ system-run error_code_test.cpp ]
diff --git a/test/std_mismatch_test.cpp b/test/std_mismatch_test.cpp
index ed6e3fc..9c97cdd 100644
--- a/test/std_mismatch_test.cpp
+++ b/test/std_mismatch_test.cpp
@@ -12,13 +12,10 @@
 # define _CRT_SECURE_NO_WARNINGS
 
 #include <boost/config.hpp>
-#include <boost/config/pragma_message.hpp>
 #include <iostream>
 
 #if defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR)
 
-BOOST_PRAGMA_MESSAGE("Skipping test, BOOST_NO_CXX11_HDR_SYSTEM_ERROR is defined")
-
 int main()
 {
   std::cout
@@ -26,11 +23,6 @@ int main()
     " support header <system_error> so interoperation will not be tested.\n";
 }
 
-#elif defined(UBSAN)
-
-BOOST_PRAGMA_MESSAGE("Skipping test, UBSAN is defined")
-int main() {}
-
 #else
 
 #include <boost/system/error_code.hpp>