diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp
index d197e1ec..f13b2d62 100644
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -22,6 +22,13 @@
 #define BOOST_NO_FENV_H  /* temporarily disable this until we can link against fegetround fesetround feholdexcept */
 #define BOOST_NO_CXX11_HDR_EXCEPTION /* Reported this bug to Embarcadero with the latest C++ Builder Rio release */
 
+//
+// check for exception handling support:
+//
+#if !defined(_CPPUNWIND) && !defined(__EXCEPTIONS) && !defined(BOOST_NO_EXCEPTIONS)
+#  define BOOST_NO_EXCEPTIONS
+#endif
+
 /*
 
 // On non-Win32 platforms let the platform config figure this out:
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f1104497..afe06f04 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -92,6 +92,7 @@ test-suite config
           : #input-files
           : #requirements
           <runtime-link>shared
+          <threading>single
           <define>BOOST_DYN_LINK=1
           <define>BOOST_CONFIG_NO_LIB=1
           <target-os>vxworks:<link>shared