diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 4443ffef..ca00ff4f 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -104,50 +104,51 @@ import ../../config/checks/config : requires ;
 
 CPP11 = [ requires cxx11_constexpr cxx11_noexcept cxx11_decltype cxx11_alignas ] ;
 
-rule build_foa ( name )
+local FOA_TESTS =
+  fwd_set_test
+  fwd_map_test
+  compile_set
+  compile_map
+  noexcept_tests
+  incomplete_test
+  simple_tests
+  equivalent_keys_tests
+  constructor_tests
+  copy_tests
+  move_tests
+  post_move_tests
+  assign_tests
+  insert_tests
+  insert_hint_tests
+  emplace_tests
+  erase_tests
+  merge_tests
+  find_tests
+  at_tests
+  load_factor_tests
+  rehash_tests
+  equality_tests
+  swap_tests
+  transparent_tests
+  reserve_tests
+  contains_tests
+  erase_if
+  scary_tests
+  init_type_insert_tests
+  max_load_tests
+  extract_tests
+  node_handle_tests
+  uses_allocator
+;
+
+for local test in $(FOA_TESTS)
 {
-  run unordered/$(name).cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_$(name) ;
+  run unordered/$(test).cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_$(test) ;
 }
 
-build_foa fwd_set_test ;
-build_foa fwd_map_test ;
-build_foa compile_set ;
-build_foa compile_map ;
-build_foa noexcept_tests ;
 run unordered/link_test_1.cpp unordered/link_test_2.cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_link_test ;
-build_foa incomplete_test ;
-build_foa simple_tests ;
-build_foa equivalent_keys_tests ;
-build_foa constructor_tests ;
-build_foa copy_tests ;
-build_foa move_tests ;
-build_foa post_move_tests ;
-build_foa assign_tests ;
-build_foa insert_tests ;
-build_foa insert_hint_tests ;
-build_foa emplace_tests ;
-build_foa erase_tests ;
-build_foa merge_tests ;
-build_foa find_tests ;
-build_foa at_tests ;
-build_foa load_factor_tests ;
-build_foa rehash_tests ;
-build_foa equality_tests ;
-build_foa swap_tests ;
 run unordered/scoped_allocator.cpp : : : $(CPP11) <toolset>msvc-14.0:<build>no <define>BOOST_UNORDERED_FOA_TESTS : foa_scoped_allocator ;
-build_foa transparent_tests ;
-build_foa reserve_tests ;
-build_foa contains_tests ;
-build_foa erase_if ;
-build_foa scary_tests ;
-build_foa init_type_insert_tests ;
-build_foa max_load_tests ;
-build_foa extract_tests ;
-build_foa node_handle_tests ;
-build_foa uses_allocator ;
-
 run unordered/hash_is_avalanching_test.cpp ;
-
 run exception/constructor_exception_tests.cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_constructor_exception_tests ;
 run exception/copy_exception_tests.cpp        : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_copy_exception_tests ;
 run exception/assign_exception_tests.cpp      : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_assign_exception_tests ;
@@ -159,43 +160,10 @@ run exception/swap_exception_tests.cpp        : : : $(CPP11) <define>BOOST_UNORD
 run exception/merge_exception_tests.cpp       : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_merge_exception_tests ;
 
 alias foa_tests :
-  hash_is_avalanching_test
-  foa_fwd_set_test
-  foa_fwd_map_test
-  foa_compile_set
-  foa_compile_map
-  foa_noexcept_tests
-  foa_incomplete_test
-  foa_simple_tests
-  foa_equivalent_keys_tests
-  foa_constructor_tests
-  foa_copy_tests
-  foa_move_tests
-  foa_post_move_tests
-  foa_assign_tests
-  foa_insert_tests
-  foa_insert_hint_tests
-  foa_emplace_tests
-  foa_erase_tests
-  foa_merge_tests
-  foa_find_tests
-  foa_at_tests
-  foa_load_factor_tests
-  foa_rehash_tests
-  foa_equality_tests
-  foa_swap_tests
-  foa_transparent_tests
-  foa_reserve_tests
-  foa_contains_tests
-  foa_erase_if
-  foa_scary_tests
-  foa_init_type_insert_tests
-  foa_max_load_tests
-  foa_extract_tests
-  foa_node_handle_tests
-  foa_uses_allocator
+  foa_$(FOA_TESTS)
   foa_link_test
   foa_scoped_allocator
+  hash_is_avalanching_test
   foa_constructor_exception_tests
   foa_copy_exception_tests
   foa_assign_exception_tests
@@ -207,21 +175,14 @@ alias foa_tests :
   foa_merge_exception_tests
 ;
 
-rule build_cfoa ( name )
+local CFOA_TESTS = insert_tests erase_tests try_emplace_tests emplace_tests visit_tests ;
+
+for local test in $(CFOA_TESTS)
 {
-  run cfoa/$(name).cpp : : : $(CPP11) : cfoa_$(name) ;
+  run cfoa/$(test).cpp
+  : requirements $(CPP11)
+  : target-name cfoa_$(test)
+  ;
 }
 
-build_cfoa insert_tests ;
-build_cfoa erase_tests ;
-build_cfoa try_emplace_tests ;
-build_cfoa emplace_tests ;
-build_cfoa visit_tests ;
-
-alias cfoa_tests :
-  cfoa_insert_tests
-  cfoa_erase_tests
-  cfoa_try_emplace_tests
-  cfoa_emplace_tests
-  cfoa_visit_tests
-;
+alias cfoa_tests : cfoa_$(CFOA_TESTS) ;