diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 2e9278b..6708c47 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -13,38 +13,44 @@ alias unit_test_framework
         /boost//unit_test_framework
     ;
 
-# Please keep the tests ordered by filename
-test-suite utility
-    :
-        [ run ../base_from_member_test.cpp ]
-        [ run ../base_from_member_ref_test.cpp ]
-        [ run ../binary_test.cpp ]
-        [ run ../call_traits_test.cpp : -u ]
-        [ run ../compressed_pair_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-        [ run ../iterators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-        [ run next_prior_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-        [ run ../numeric_traits_test.cpp ]
-        [ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
-        [ compile result_of_test.cpp ]
-        [ run ../shared_iterator_test.cpp ]
-#        [ compile-fail string_ref_from_rvalue.cpp ]
-        [ run string_ref_test1.cpp unit_test_framework ]
-        [ run string_ref_test2.cpp unit_test_framework ]
-        [ run string_ref_test_io.cpp unit_test_framework ]
-#        [ compile-fail string_view_from_rvalue.cpp ]
-        [ compile string_view_constexpr_test1.cpp ]
-        [ run string_view_test1.cpp unit_test_framework ]
-        [ run string_view_test2.cpp unit_test_framework ]
-        [ run string_view_test_io.cpp unit_test_framework ]
-        [ run ../value_init_test.cpp ]
-        [ run ../value_init_workaround_test.cpp ]
-        [ run ../initialized_test.cpp ]
-        [ compile-fail ../value_init_test_fail1.cpp ]
-        [ compile-fail ../value_init_test_fail2.cpp ]
-        [ compile-fail ../value_init_test_fail3.cpp ]
-        [ compile-fail ../initialized_test_fail1.cpp ]
-        [ compile-fail ../initialized_test_fail2.cpp ]
+run base_from_member_test.cpp ;
+run base_from_member_ref_test.cpp ;
 
-        [ run ../generator_iterator_test.cpp ]
-    ;
+run binary_test.cpp ;
 
+run call_traits_test.cpp : -u ;
+
+run compressed_pair_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ;
+
+run iterators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ;
+
+run next_prior_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ;
+
+run numeric_traits_test.cpp ;
+
+run operators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ;
+
+compile result_of_test.cpp ;
+
+run shared_iterator_test.cpp ;
+
+# compile-fail string_ref_from_rvalue.cpp ;
+run string_ref_test1.cpp unit_test_framework ;
+run string_ref_test2.cpp unit_test_framework ;
+run string_ref_test_io.cpp unit_test_framework ;
+# compile-fail string_view_from_rvalue.cpp ;
+compile string_view_constexpr_test1.cpp ;
+run string_view_test1.cpp unit_test_framework ;
+run string_view_test2.cpp unit_test_framework ;
+run string_view_test_io.cpp unit_test_framework ;
+
+run value_init_test.cpp ;
+run value_init_workaround_test.cpp ;
+run initialized_test.cpp ;
+compile-fail value_init_test_fail1.cpp ;
+compile-fail value_init_test_fail2.cpp ;
+compile-fail value_init_test_fail3.cpp ;
+compile-fail initialized_test_fail1.cpp ;
+compile-fail initialized_test_fail2.cpp ;
+
+run generator_iterator_test.cpp ;
diff --git a/base_from_member_ref_test.cpp b/test/base_from_member_ref_test.cpp
similarity index 100%
rename from base_from_member_ref_test.cpp
rename to test/base_from_member_ref_test.cpp
diff --git a/base_from_member_test.cpp b/test/base_from_member_test.cpp
similarity index 100%
rename from base_from_member_test.cpp
rename to test/base_from_member_test.cpp
diff --git a/binary_test.cpp b/test/binary_test.cpp
similarity index 100%
rename from binary_test.cpp
rename to test/binary_test.cpp
diff --git a/call_traits_test.cpp b/test/call_traits_test.cpp
similarity index 100%
rename from call_traits_test.cpp
rename to test/call_traits_test.cpp
diff --git a/compressed_pair_test.cpp b/test/compressed_pair_test.cpp
similarity index 100%
rename from compressed_pair_test.cpp
rename to test/compressed_pair_test.cpp
diff --git a/generator_iterator_test.cpp b/test/generator_iterator_test.cpp
similarity index 100%
rename from generator_iterator_test.cpp
rename to test/generator_iterator_test.cpp
diff --git a/initialized_test.cpp b/test/initialized_test.cpp
similarity index 100%
rename from initialized_test.cpp
rename to test/initialized_test.cpp
diff --git a/initialized_test_fail1.cpp b/test/initialized_test_fail1.cpp
similarity index 100%
rename from initialized_test_fail1.cpp
rename to test/initialized_test_fail1.cpp
diff --git a/initialized_test_fail2.cpp b/test/initialized_test_fail2.cpp
similarity index 100%
rename from initialized_test_fail2.cpp
rename to test/initialized_test_fail2.cpp
diff --git a/iterators_test.cpp b/test/iterators_test.cpp
similarity index 100%
rename from iterators_test.cpp
rename to test/iterators_test.cpp
diff --git a/numeric_traits_test.cpp b/test/numeric_traits_test.cpp
similarity index 100%
rename from numeric_traits_test.cpp
rename to test/numeric_traits_test.cpp
diff --git a/operators_test.cpp b/test/operators_test.cpp
similarity index 100%
rename from operators_test.cpp
rename to test/operators_test.cpp
diff --git a/shared_iterator_test.cpp b/test/shared_iterator_test.cpp
similarity index 100%
rename from shared_iterator_test.cpp
rename to test/shared_iterator_test.cpp
diff --git a/value_init_test.cpp b/test/value_init_test.cpp
similarity index 100%
rename from value_init_test.cpp
rename to test/value_init_test.cpp
diff --git a/value_init_test_fail1.cpp b/test/value_init_test_fail1.cpp
similarity index 100%
rename from value_init_test_fail1.cpp
rename to test/value_init_test_fail1.cpp
diff --git a/value_init_test_fail2.cpp b/test/value_init_test_fail2.cpp
similarity index 100%
rename from value_init_test_fail2.cpp
rename to test/value_init_test_fail2.cpp
diff --git a/value_init_test_fail3.cpp b/test/value_init_test_fail3.cpp
similarity index 100%
rename from value_init_test_fail3.cpp
rename to test/value_init_test_fail3.cpp
diff --git a/value_init_workaround_test.cpp b/test/value_init_workaround_test.cpp
similarity index 100%
rename from value_init_workaround_test.cpp
rename to test/value_init_workaround_test.cpp