diff --git a/tests/analysis_mixins/__init__.py b/tests/analysis_mixins/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/analysis_mixins/conftest.py b/tests/problems/generic/conftest.py
similarity index 100%
rename from tests/analysis_mixins/conftest.py
rename to tests/problems/generic/conftest.py
diff --git a/tests/analysis_mixins/test_base_analysis.py b/tests/problems/generic/test_mixins.py
similarity index 100%
rename from tests/analysis_mixins/test_base_analysis.py
rename to tests/problems/generic/test_mixins.py