diff --git a/smoothschedule/smoothschedule/commerce/payments/tests.py b/smoothschedule/smoothschedule/commerce/payments/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/smoothschedule/smoothschedule/commerce/payments/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/smoothschedule/smoothschedule/commerce/payments/tests/__init__.py b/smoothschedule/smoothschedule/commerce/payments/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/commerce/tickets/tests.py b/smoothschedule/smoothschedule/commerce/tickets/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/smoothschedule/smoothschedule/commerce/tickets/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/smoothschedule/smoothschedule/commerce/tickets/tests/__init__.py b/smoothschedule/smoothschedule/commerce/tickets/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/communication/credits/tests/__init__.py b/smoothschedule/smoothschedule/communication/credits/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/communication/messaging/tests.py b/smoothschedule/smoothschedule/communication/messaging/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/smoothschedule/smoothschedule/communication/messaging/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/smoothschedule/smoothschedule/communication/messaging/tests/__init__.py b/smoothschedule/smoothschedule/communication/messaging/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/communication/mobile/tests/__init__.py b/smoothschedule/smoothschedule/communication/mobile/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/communication/notifications/tests.py b/smoothschedule/smoothschedule/communication/notifications/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/smoothschedule/smoothschedule/communication/notifications/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/smoothschedule/smoothschedule/communication/notifications/tests/__init__.py b/smoothschedule/smoothschedule/communication/notifications/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/identity/core/tests/__init__.py b/smoothschedule/smoothschedule/identity/core/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/platform/admin/tests/__init__.py b/smoothschedule/smoothschedule/platform/admin/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/platform/api/tests/__init__.py b/smoothschedule/smoothschedule/platform/api/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/platform/api/tests_token_security.py b/smoothschedule/smoothschedule/platform/api/tests/test_token_security.py
similarity index 100%
rename from smoothschedule/smoothschedule/platform/api/tests_token_security.py
rename to smoothschedule/smoothschedule/platform/api/tests/test_token_security.py
diff --git a/smoothschedule/smoothschedule/scheduling/analytics/tests/__init__.py b/smoothschedule/smoothschedule/scheduling/analytics/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/scheduling/analytics/tests.py b/smoothschedule/smoothschedule/scheduling/analytics/tests/test_views.py
similarity index 100%
rename from smoothschedule/smoothschedule/scheduling/analytics/tests.py
rename to smoothschedule/smoothschedule/scheduling/analytics/tests/test_views.py
diff --git a/smoothschedule/smoothschedule/scheduling/contracts/tests.py b/smoothschedule/smoothschedule/scheduling/contracts/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/smoothschedule/smoothschedule/scheduling/contracts/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/smoothschedule/smoothschedule/scheduling/contracts/tests/__init__.py b/smoothschedule/smoothschedule/scheduling/contracts/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/smoothschedule/scheduling/schedule/tests.py b/smoothschedule/smoothschedule/scheduling/schedule/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/smoothschedule/smoothschedule/scheduling/schedule/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/smoothschedule/smoothschedule/scheduling/schedule/test_export.py b/smoothschedule/smoothschedule/scheduling/schedule/tests/test_export.py
similarity index 100%
rename from smoothschedule/smoothschedule/scheduling/schedule/test_export.py
rename to smoothschedule/smoothschedule/scheduling/schedule/tests/test_export.py