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/bitset_test.hpp b/test/bitset_test.hpp
similarity index 100%
rename from bitset_test.hpp
rename to test/bitset_test.hpp
diff --git a/dyn_bitset_unit_tests1.cpp b/test/dyn_bitset_unit_tests1.cpp
similarity index 100%
rename from dyn_bitset_unit_tests1.cpp
rename to test/dyn_bitset_unit_tests1.cpp
diff --git a/dyn_bitset_unit_tests2.cpp b/test/dyn_bitset_unit_tests2.cpp
similarity index 100%
rename from dyn_bitset_unit_tests2.cpp
rename to test/dyn_bitset_unit_tests2.cpp
diff --git a/dyn_bitset_unit_tests3.cpp b/test/dyn_bitset_unit_tests3.cpp
similarity index 100%
rename from dyn_bitset_unit_tests3.cpp
rename to test/dyn_bitset_unit_tests3.cpp
diff --git a/dyn_bitset_unit_tests4.cpp b/test/dyn_bitset_unit_tests4.cpp
similarity index 100%
rename from dyn_bitset_unit_tests4.cpp
rename to test/dyn_bitset_unit_tests4.cpp