diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 4210f127..817fd125 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -133,3 +133,5 @@ build_foa reserve_tests ;
 build_foa contains_tests ;
 build_foa erase_if ;
 build_foa scary_tests ;
+
+run exception/constructor_exception_tests.cpp : : : <cxxstd>98:<build>no <cxxstd>03:<build>no <cxxstd>0x:<build>no <define>BOOST_UNORDERED_FOA_TESTS : foa_constructor_exception_tests ;
diff --git a/test/exception/containers.hpp b/test/exception/containers.hpp
index c3b34be2..9f78923d 100644
--- a/test/exception/containers.hpp
+++ b/test/exception/containers.hpp
@@ -3,15 +3,30 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// clang-format off
-#include "../helpers/prefix.hpp"
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
-#include "../helpers/postfix.hpp"
-// clang-format on
+#include "../helpers/unordered.hpp"
 
 #include "../objects/exception.hpp"
 
+#ifdef BOOST_UNORDERED_FOA_TESTS
+typedef boost::unordered_flat_set<test::exception::object,
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator<test::exception::object> >
+  test_set;
+
+typedef boost::unordered_flat_map<test::exception::object,
+  test::exception::object, test::exception::hash, test::exception::equal_to,
+  test::exception::allocator2<test::exception::object> >
+  test_map;
+
+typedef boost::unordered_flat_set<
+  std::pair<test::exception::object, test::exception::object>,
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator<test::exception::object> >
+  test_pair_set;
+
+#define CONTAINER_SEQ (test_set)(test_map)
+#define CONTAINER_PAIR_SEQ (test_pair_set)(test_map)
+#else
 typedef boost::unordered_set<test::exception::object, test::exception::hash,
   test::exception::equal_to,
   test::exception::allocator<test::exception::object> >
@@ -42,3 +57,5 @@ typedef boost::unordered_multiset<
 #define CONTAINER_SEQ (test_set)(test_multiset)(test_map)(test_multimap)
 #define CONTAINER_PAIR_SEQ                                                     \
   (test_pair_set)(test_pair_multiset)(test_map)(test_multimap)
+
+#endif