diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_analysissessions/__init__.py b/tests/test_analysissessions/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/publicdb/analysissessions/tests.py b/tests/test_analysissessions/test_analysissessions.py
similarity index 100%
rename from publicdb/analysissessions/tests.py
rename to tests/test_analysissessions/test_analysissessions.py
diff --git a/tests/test_api/__init__.py b/tests/test_api/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/publicdb/api/tests.py b/tests/test_api/test_api.py
similarity index 97%
rename from publicdb/api/tests.py
rename to tests/test_api/test_api.py
index 4088015cb..052e299b0 100644
--- a/publicdb/api/tests.py
+++ b/tests/test_api/test_api.py
@@ -7,8 +7,8 @@
 
 from lib.test import datastore as test_datastore
 
-from ..histograms.models import *
-from ..inforecords.models import *
+from publicdb.histograms.models import *
+from publicdb.inforecords.models import *
 
 
 def is_json(response):
diff --git a/tests/test_coincidences/__init__.py b/tests/test_coincidences/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/publicdb/coincidences/tests.py b/tests/test_coincidences/test_coincidences.py
similarity index 100%
rename from publicdb/coincidences/tests.py
rename to tests/test_coincidences/test_coincidences.py
diff --git a/tests/test_histograms/__init__.py b/tests/test_histograms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/publicdb/histograms/tests.py b/tests/test_histograms/test_histograms.py
similarity index 100%
rename from publicdb/histograms/tests.py
rename to tests/test_histograms/test_histograms.py
diff --git a/tests/test_inforecords/__init__.py b/tests/test_inforecords/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/publicdb/inforecords/tests.py b/tests/test_inforecords/test_inforecords.py
similarity index 100%
rename from publicdb/inforecords/tests.py
rename to tests/test_inforecords/test_inforecords.py
diff --git a/tests/test_jsparc/__init__.py b/tests/test_jsparc/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/publicdb/jsparc/tests.py b/tests/test_jsparc/test_jsparc.py
similarity index 100%
rename from publicdb/jsparc/tests.py
rename to tests/test_jsparc/test_jsparc.py
diff --git a/tests/test_status_display/__init__.py b/tests/test_status_display/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/publicdb/status_display/tests.py b/tests/test_status_display/test_status_display.py
similarity index 100%
rename from publicdb/status_display/tests.py
rename to tests/test_status_display/test_status_display.py