diff --git a/tracetools_analysis/test/test_data_model_util.py b/tracetools_analysis/test/tracetools_analysis/test_data_model_util.py
similarity index 100%
rename from tracetools_analysis/test/test_data_model_util.py
rename to tracetools_analysis/test/tracetools_analysis/test_data_model_util.py
diff --git a/tracetools_analysis/test/test_dependency_solver.py b/tracetools_analysis/test/tracetools_analysis/test_dependency_solver.py
similarity index 100%
rename from tracetools_analysis/test/test_dependency_solver.py
rename to tracetools_analysis/test/tracetools_analysis/test_dependency_solver.py
diff --git a/tracetools_analysis/test/test_process_command.py b/tracetools_analysis/test/tracetools_analysis/test_process_command.py
similarity index 100%
rename from tracetools_analysis/test/test_process_command.py
rename to tracetools_analysis/test/tracetools_analysis/test_process_command.py
diff --git a/tracetools_analysis/test/test_processor.py b/tracetools_analysis/test/tracetools_analysis/test_processor.py
similarity index 100%
rename from tracetools_analysis/test/test_processor.py
rename to tracetools_analysis/test/tracetools_analysis/test_processor.py
diff --git a/tracetools_analysis/test/test_profile_handler.py b/tracetools_analysis/test/tracetools_analysis/test_profile_handler.py
similarity index 100%
rename from tracetools_analysis/test/test_profile_handler.py
rename to tracetools_analysis/test/tracetools_analysis/test_profile_handler.py
diff --git a/tracetools_analysis/test/test_utils.py b/tracetools_analysis/test/tracetools_analysis/test_utils.py
similarity index 100%
rename from tracetools_analysis/test/test_utils.py
rename to tracetools_analysis/test/tracetools_analysis/test_utils.py