diff --git a/Jamfile b/Jamfile
new file mode 100644
index 0000000..cf5eb61
--- /dev/null
+++ b/Jamfile
@@ -0,0 +1,3 @@
+# Empty Jamfile because the super project still expects one to appear here.
+# Can be deleted once 'status/Jamfile.v2' has been updated in the super
+# project.
diff --git a/Jamfile.v2 b/test/Jamfile.v2
similarity index 100%
rename from Jamfile.v2
rename to test/Jamfile.v2
diff --git a/class_concept_check_test.cpp b/test/class_concept_check_test.cpp
similarity index 100%
rename from class_concept_check_test.cpp
rename to test/class_concept_check_test.cpp
diff --git a/class_concept_fail_expected.cpp b/test/class_concept_fail_expected.cpp
similarity index 100%
rename from class_concept_fail_expected.cpp
rename to test/class_concept_fail_expected.cpp
diff --git a/concept_check_fail_expected.cpp b/test/concept_check_fail_expected.cpp
similarity index 100%
rename from concept_check_fail_expected.cpp
rename to test/concept_check_fail_expected.cpp
diff --git a/concept_check_test.cpp b/test/concept_check_test.cpp
similarity index 100%
rename from concept_check_test.cpp
rename to test/concept_check_test.cpp
diff --git a/fake_sort.hpp b/test/fake_sort.hpp
similarity index 100%
rename from fake_sort.hpp
rename to test/fake_sort.hpp
diff --git a/function_requires_fail.cpp b/test/function_requires_fail.cpp
similarity index 100%
rename from function_requires_fail.cpp
rename to test/function_requires_fail.cpp
diff --git a/old_concept_class_fail.cpp b/test/old_concept_class_fail.cpp
similarity index 100%
rename from old_concept_class_fail.cpp
rename to test/old_concept_class_fail.cpp
diff --git a/old_concept_function_fail.cpp b/test/old_concept_function_fail.cpp
similarity index 100%
rename from old_concept_function_fail.cpp
rename to test/old_concept_function_fail.cpp
diff --git a/old_concept_pass.cpp b/test/old_concept_pass.cpp
similarity index 100%
rename from old_concept_pass.cpp
rename to test/old_concept_pass.cpp
diff --git a/old_concepts.hpp b/test/old_concepts.hpp
similarity index 100%
rename from old_concepts.hpp
rename to test/old_concepts.hpp
diff --git a/stl_concept_check.cpp b/test/stl_concept_check.cpp
similarity index 100%
rename from stl_concept_check.cpp
rename to test/stl_concept_check.cpp
diff --git a/stl_concept_covering.cpp b/test/stl_concept_covering.cpp
similarity index 100%
rename from stl_concept_covering.cpp
rename to test/stl_concept_covering.cpp
diff --git a/usage_fail.cpp b/test/usage_fail.cpp
similarity index 100%
rename from usage_fail.cpp
rename to test/usage_fail.cpp
diff --git a/where.cpp b/test/where.cpp
similarity index 100%
rename from where.cpp
rename to test/where.cpp
diff --git a/where_fail.cpp b/test/where_fail.cpp
similarity index 100%
rename from where_fail.cpp
rename to test/where_fail.cpp