diff --git a/coldfront/core/field_of_science/tests/__init__.py b/coldfront/core/field_of_science/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/field_of_science/tests.py b/coldfront/core/field_of_science/tests/tests.py
similarity index 100%
rename from coldfront/core/field_of_science/tests.py
rename to coldfront/core/field_of_science/tests/tests.py
diff --git a/coldfront/core/grant/tests/__init__.py b/coldfront/core/grant/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/grant/tests.py b/coldfront/core/grant/tests/tests.py
similarity index 100%
rename from coldfront/core/grant/tests.py
rename to coldfront/core/grant/tests/tests.py
diff --git a/coldfront/core/portal/tests/__init__.py b/coldfront/core/portal/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/portal/tests.py b/coldfront/core/portal/tests/tests.py
similarity index 100%
rename from coldfront/core/portal/tests.py
rename to coldfront/core/portal/tests/tests.py
diff --git a/coldfront/core/project/tests/__init__.py b/coldfront/core/project/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/project/test_views.py b/coldfront/core/project/tests/test_views.py
similarity index 100%
rename from coldfront/core/project/test_views.py
rename to coldfront/core/project/tests/test_views.py
diff --git a/coldfront/core/project/tests.py b/coldfront/core/project/tests/tests.py
similarity index 100%
rename from coldfront/core/project/tests.py
rename to coldfront/core/project/tests/tests.py
diff --git a/coldfront/core/publication/tests/__init__.py b/coldfront/core/publication/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/publication/tests.py b/coldfront/core/publication/tests/tests.py
similarity index 100%
rename from coldfront/core/publication/tests.py
rename to coldfront/core/publication/tests/tests.py
diff --git a/coldfront/core/research_output/tests/__init__.py b/coldfront/core/research_output/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/research_output/tests.py b/coldfront/core/research_output/tests/tests.py
similarity index 100%
rename from coldfront/core/research_output/tests.py
rename to coldfront/core/research_output/tests/tests.py
diff --git a/coldfront/core/resource/tests/__init__.py b/coldfront/core/resource/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/resource/tests.py b/coldfront/core/resource/tests/tests.py
similarity index 100%
rename from coldfront/core/resource/tests.py
rename to coldfront/core/resource/tests/tests.py
diff --git a/coldfront/core/user/tests/__init__.py b/coldfront/core/user/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/user/tests.py b/coldfront/core/user/tests/tests.py
similarity index 100%
rename from coldfront/core/user/tests.py
rename to coldfront/core/user/tests/tests.py
diff --git a/coldfront/core/utils/tests/__init__.py b/coldfront/core/utils/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/coldfront/core/utils/tests.py b/coldfront/core/utils/tests/tests.py
similarity index 100%
rename from coldfront/core/utils/tests.py
rename to coldfront/core/utils/tests/tests.py