diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index a33e113e7..4755568ae 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -144,9 +144,9 @@ test-suite examples :
    [ run autodiff_fourth_power.cpp : : : [ requires cxx11_inline_namespaces ] ]
    [ run autodiff_mixed_partials.cpp : : : [ requires cxx11_inline_namespaces ] ]
    [ run autodiff_multiprecision.cpp : : : [ requires cxx11_inline_namespaces ] ]
-   [ run ooura_fourier_integrals_example.cpp : : : [ requires cxx11_lambdas cxx11_inline_namespaces cxx11_auto_declarations ] ]
-   [ run ooura_fourier_integrals_cosine_example.cpp : : : [ requires cxx11_inline_namespaces cxx11_auto_declarations cxx17_std_apply ] ]
-   [ run ooura_fourier_integrals_multiprecision_example.cpp : : : [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ] [ requires cxx11_inline_namespaces cxx11_auto_declarations cxx17_std_apply ] ]
+   [ run ooura_fourier_integrals_example.cpp : : : [ requires cxx11_hdr_mutex cxx11_lambdas cxx11_inline_namespaces cxx11_auto_declarations ] ]
+   [ run ooura_fourier_integrals_cosine_example.cpp : : : [ requires cxx11_hdr_mutex cxx11_inline_namespaces cxx11_auto_declarations cxx17_std_apply ] ]
+   [ run ooura_fourier_integrals_multiprecision_example.cpp : : : [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ] [ requires cxx11_hdr_mutex cxx11_inline_namespaces cxx11_auto_declarations cxx17_std_apply ] ]
 
 ;
 
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 84cb29079..06992734c 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1071,12 +1071,16 @@ test-suite quadrature :
      : : : <toolset>msvc:<cxxflags>/bigobj <define>TEST1A [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
      [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
 	 tanh_sinh_quadrature_test_1a ]
+   [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
+     : : : release <toolset>msvc:<cxxflags>/bigobj <define>TEST1B [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
+     [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
+	 tanh_sinh_quadrature_test_1b ]
    [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
      : : : <toolset>msvc:<cxxflags>/bigobj <define>TEST2 [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
      [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
 	 tanh_sinh_quadrature_test_2 ]
    [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
-     : : : <toolset>msvc:<cxxflags>/bigobj <define>TEST2A [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
+     : : : release <toolset>msvc:<cxxflags>/bigobj <define>TEST2A [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
      [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
 	 tanh_sinh_quadrature_test_2a ]
    [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
@@ -1084,7 +1088,7 @@ test-suite quadrature :
      [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
 	 tanh_sinh_quadrature_test_3 ]
    [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
-     : : : <toolset>msvc:<cxxflags>/bigobj <define>TEST3A [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
+     : : : release <toolset>msvc:<cxxflags>/bigobj <define>TEST3A [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
      [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
 	 tanh_sinh_quadrature_test_3a ]
    [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
@@ -1100,7 +1104,7 @@ test-suite quadrature :
      [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
 	 tanh_sinh_quadrature_test_6 ]
    [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
-     : : : <toolset>msvc:<cxxflags>/bigobj <define>TEST6A [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
+     : : : release <toolset>msvc:<cxxflags>/bigobj <define>TEST6A [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>-lquadmath ]
      [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax sfinae_expr ] :
 	 tanh_sinh_quadrature_test_6a ]
    [ run  tanh_sinh_quadrature_test.cpp ../../test/build//boost_unit_test_framework
diff --git a/test/tanh_sinh_quadrature_test.cpp b/test/tanh_sinh_quadrature_test.cpp
index beaa06526..e15ef9e5e 100644
--- a/test/tanh_sinh_quadrature_test.cpp
+++ b/test/tanh_sinh_quadrature_test.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #if !defined(TEST1) && !defined(TEST2) && !defined(TEST3) && !defined(TEST4) && !defined(TEST5) && !defined(TEST6) && !defined(TEST7) && !defined(TEST8)\
-    && !defined(TEST1A) && !defined(TEST2A) && !defined(TEST3A) && !defined(TEST6A) && !defined(TEST9)
+    && !defined(TEST1A) && !defined(TEST1B) && !defined(TEST2A) && !defined(TEST3A) && !defined(TEST6A) && !defined(TEST9)
 #  define TEST1
 #  define TEST2
 #  define TEST3
@@ -43,6 +43,7 @@
 #  define TEST7
 #  define TEST8
 #  define TEST1A
+#  define TEST1B
 #  define TEST2A
 #  define TEST3A
 #  define TEST6A
@@ -859,9 +860,10 @@ BOOST_AUTO_TEST_CASE(tanh_sinh_quadrature_test)
 #endif
 #ifdef TEST1A
     test_early_termination<float>();
-    test_crc<float>();
     test_2_arg<float>();
-
+#endif
+#ifdef TEST1B
+    test_crc<float>();
 #endif
 #ifdef TEST2
     test_right_limit_infinite<double>();
@@ -906,7 +908,6 @@ BOOST_AUTO_TEST_CASE(tanh_sinh_quadrature_test)
 #endif
 
 #ifdef TEST4
-
     test_right_limit_infinite<cpp_bin_float_quad>();
     test_left_limit_infinite<cpp_bin_float_quad>();
     test_linear<cpp_bin_float_quad>();