diff --git a/bootstrap.py b/bootstrap.py
index 2ff7a8cf..4d68f798 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -151,7 +151,7 @@ else:
 
 tests_inputs = []
 tests_object_files = []
-for f in glob.glob('test*.cpp'):
+for f in glob.glob('tests/test*.cpp'):
     obj = object_file(f)
     tests_inputs.append(f)
     tests_object_files.append(obj)
diff --git a/test_container_semantics.cpp b/tests/test_container_semantics.cpp
similarity index 100%
rename from test_container_semantics.cpp
rename to tests/test_container_semantics.cpp
diff --git a/test_containers.cpp b/tests/test_containers.cpp
similarity index 100%
rename from test_containers.cpp
rename to tests/test_containers.cpp
diff --git a/test_coroutines.cpp b/tests/test_coroutines.cpp
similarity index 100%
rename from test_coroutines.cpp
rename to tests/test_coroutines.cpp
diff --git a/test_customizations.cpp b/tests/test_customizations.cpp
similarity index 100%
rename from test_customizations.cpp
rename to tests/test_customizations.cpp
diff --git a/test_environments.cpp b/tests/test_environments.cpp
similarity index 100%
rename from test_environments.cpp
rename to tests/test_environments.cpp
diff --git a/test_filters.cpp b/tests/test_filters.cpp
similarity index 100%
rename from test_filters.cpp
rename to tests/test_filters.cpp
diff --git a/test_functions.cpp b/tests/test_functions.cpp
similarity index 100%
rename from test_functions.cpp
rename to tests/test_functions.cpp
diff --git a/test_gc.cpp b/tests/test_gc.cpp
similarity index 100%
rename from test_gc.cpp
rename to tests/test_gc.cpp
diff --git a/test_inheritance.cpp b/tests/test_inheritance.cpp
similarity index 100%
rename from test_inheritance.cpp
rename to tests/test_inheritance.cpp
diff --git a/test_large_integer.cpp b/tests/test_large_integer.cpp
similarity index 100%
rename from test_large_integer.cpp
rename to tests/test_large_integer.cpp
diff --git a/test_operators.cpp b/tests/test_operators.cpp
similarity index 100%
rename from test_operators.cpp
rename to tests/test_operators.cpp
diff --git a/test_overflow.cpp b/tests/test_overflow.cpp
similarity index 100%
rename from test_overflow.cpp
rename to tests/test_overflow.cpp
diff --git a/test_plain_types.cpp b/tests/test_plain_types.cpp
similarity index 100%
rename from test_plain_types.cpp
rename to tests/test_plain_types.cpp
diff --git a/test_simple_usertypes.cpp b/tests/test_simple_usertypes.cpp
similarity index 100%
rename from test_simple_usertypes.cpp
rename to tests/test_simple_usertypes.cpp
diff --git a/test_stack_guard.hpp b/tests/test_stack_guard.hpp
similarity index 100%
rename from test_stack_guard.hpp
rename to tests/test_stack_guard.hpp
diff --git a/test_state.cpp b/tests/test_state.cpp
similarity index 100%
rename from test_state.cpp
rename to tests/test_state.cpp
diff --git a/test_storage.cpp b/tests/test_storage.cpp
similarity index 100%
rename from test_storage.cpp
rename to tests/test_storage.cpp
diff --git a/test_strings.cpp b/tests/test_strings.cpp
similarity index 100%
rename from test_strings.cpp
rename to tests/test_strings.cpp
diff --git a/test_tables.cpp b/tests/test_tables.cpp
similarity index 100%
rename from test_tables.cpp
rename to tests/test_tables.cpp
diff --git a/test_usertypes.cpp b/tests/test_usertypes.cpp
similarity index 100%
rename from test_usertypes.cpp
rename to tests/test_usertypes.cpp
diff --git a/test_utility.cpp b/tests/test_utility.cpp
similarity index 100%
rename from test_utility.cpp
rename to tests/test_utility.cpp
diff --git a/test_variadics.cpp b/tests/test_variadics.cpp
similarity index 100%
rename from test_variadics.cpp
rename to tests/test_variadics.cpp
diff --git a/tests.cpp b/tests/tests.cpp
similarity index 100%
rename from tests.cpp
rename to tests/tests.cpp