diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
index 58525d405ce..72184b7fbf9 100644
--- a/.github/workflows/unit_tests.yaml
+++ b/.github/workflows/unit_tests.yaml
@@ -174,7 +174,7 @@ jobs:
         spack bootstrap disable github-actions-v0.6
         spack bootstrap status
         spack solve zlib
-        spack unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml lib/spack/spack/test/concretize.py
+        spack unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml lib/spack/spack/test/concretization/core.py
     - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
         name: coverage-clingo-cffi
diff --git a/lib/spack/spack/test/concretize_compiler_runtimes.py b/lib/spack/spack/test/concretization/compiler_runtimes.py
similarity index 100%
rename from lib/spack/spack/test/concretize_compiler_runtimes.py
rename to lib/spack/spack/test/concretization/compiler_runtimes.py
diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretization/core.py
similarity index 100%
rename from lib/spack/spack/test/concretize.py
rename to lib/spack/spack/test/concretization/core.py
diff --git a/lib/spack/spack/test/concretize_errors.py b/lib/spack/spack/test/concretization/errors.py
similarity index 100%
rename from lib/spack/spack/test/concretize_errors.py
rename to lib/spack/spack/test/concretization/errors.py
diff --git a/lib/spack/spack/test/flag_mixing.py b/lib/spack/spack/test/concretization/flag_mixing.py
similarity index 100%
rename from lib/spack/spack/test/flag_mixing.py
rename to lib/spack/spack/test/concretization/flag_mixing.py
diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretization/preferences.py
similarity index 100%
rename from lib/spack/spack/test/concretize_preferences.py
rename to lib/spack/spack/test/concretization/preferences.py
diff --git a/lib/spack/spack/test/concretize_requirements.py b/lib/spack/spack/test/concretization/requirements.py
similarity index 100%
rename from lib/spack/spack/test/concretize_requirements.py
rename to lib/spack/spack/test/concretization/requirements.py