diff --git a/tests/population/comparison_result.dat b/tests/population/scaling/comparison_result.dat
similarity index 100%
rename from tests/population/comparison_result.dat
rename to tests/population/scaling/comparison_result.dat
diff --git a/tests/population/comparison_result_astro1.dat b/tests/population/scaling/comparison_result_astro1.dat
similarity index 100%
rename from tests/population/comparison_result_astro1.dat
rename to tests/population/scaling/comparison_result_astro1.dat
diff --git a/tests/population/plot_scaling.py b/tests/population/scaling/plot_scaling.py
similarity index 100%
rename from tests/population/plot_scaling.py
rename to tests/population/scaling/plot_scaling.py
diff --git a/tests/population/run_tests.sh b/tests/population/scaling/run_tests.sh
similarity index 100%
rename from tests/population/run_tests.sh
rename to tests/population/scaling/run_tests.sh
diff --git a/tests/population/run_tests_astro1.sh b/tests/population/scaling/run_tests_astro1.sh
similarity index 100%
rename from tests/population/run_tests_astro1.sh
rename to tests/population/scaling/run_tests_astro1.sh
diff --git a/tests/population/name_testcase.pdf b/tests/population/scaling/scaling_plots/name_testcase.pdf
similarity index 100%
rename from tests/population/name_testcase.pdf
rename to tests/population/scaling/scaling_plots/name_testcase.pdf
diff --git a/tests/population/name_testcase.png b/tests/population/scaling/scaling_plots/name_testcase.png
similarity index 100%
rename from tests/population/name_testcase.png
rename to tests/population/scaling/scaling_plots/name_testcase.png
diff --git a/tests/population/scaling_plots/speedup_scaling_Astro1.eps b/tests/population/scaling/scaling_plots/speedup_scaling_Astro1.eps
similarity index 100%
rename from tests/population/scaling_plots/speedup_scaling_Astro1.eps
rename to tests/population/scaling/scaling_plots/speedup_scaling_Astro1.eps
diff --git a/tests/population/scaling_plots/speedup_scaling_Astro1.pdf b/tests/population/scaling/scaling_plots/speedup_scaling_Astro1.pdf
similarity index 100%
rename from tests/population/scaling_plots/speedup_scaling_Astro1.pdf
rename to tests/population/scaling/scaling_plots/speedup_scaling_Astro1.pdf
diff --git a/tests/population/scaling_plots/speedup_scaling_Astro1.png b/tests/population/scaling/scaling_plots/speedup_scaling_Astro1.png
similarity index 100%
rename from tests/population/scaling_plots/speedup_scaling_Astro1.png
rename to tests/population/scaling/scaling_plots/speedup_scaling_Astro1.png