diff --git a/tests/em/fdem/__init__.py b/tests/em/fdem/__init__.py
new file mode 100644
index 00000000..38d84328
--- /dev/null
+++ b/tests/em/fdem/__init__.py
@@ -0,0 +1,11 @@
+if __name__ == '__main__':
+    import os
+    import glob
+    import unittest
+    test_file_strings = glob.glob('test_*.py')
+    module_strings = [str[0:len(str)-3] for str in test_file_strings]
+    suites = [unittest.defaultTestLoader.loadTestsFromName(str) for str
+              in module_strings]
+    testSuite = unittest.TestSuite(suites)
+
+    unittest.TextTestRunner(verbosity=2).run(testSuite)
diff --git a/tests/em/test_FDEM.py b/tests/em/fdem/test_FDEM.py
similarity index 100%
rename from tests/em/test_FDEM.py
rename to tests/em/fdem/test_FDEM.py
diff --git a/tests/em/test_FDEMCasing.py b/tests/em/fdem/test_FDEMCasing.py
similarity index 100%
rename from tests/em/test_FDEMCasing.py
rename to tests/em/fdem/test_FDEMCasing.py
diff --git a/tests/em/test_FDEM_analytics.py b/tests/em/fdem/test_FDEM_analytics.py
similarity index 100%
rename from tests/em/test_FDEM_analytics.py
rename to tests/em/fdem/test_FDEM_analytics.py
diff --git a/tests/em/tdem/__init__.py b/tests/em/tdem/__init__.py
new file mode 100644
index 00000000..38d84328
--- /dev/null
+++ b/tests/em/tdem/__init__.py
@@ -0,0 +1,11 @@
+if __name__ == '__main__':
+    import os
+    import glob
+    import unittest
+    test_file_strings = glob.glob('test_*.py')
+    module_strings = [str[0:len(str)-3] for str in test_file_strings]
+    suites = [unittest.defaultTestLoader.loadTestsFromName(str) for str
+              in module_strings]
+    testSuite = unittest.TestSuite(suites)
+
+    unittest.TextTestRunner(verbosity=2).run(testSuite)
diff --git a/tests/em/test_TDEM_b_DerivAdjoint.py b/tests/em/tdem/test_TDEM_b_DerivAdjoint.py
similarity index 100%
rename from tests/em/test_TDEM_b_DerivAdjoint.py
rename to tests/em/tdem/test_TDEM_b_DerivAdjoint.py
diff --git a/tests/em/test_TDEM_b_MultiSrc_DerivAdjoint.py b/tests/em/tdem/test_TDEM_b_MultiSrc_DerivAdjoint.py
similarity index 100%
rename from tests/em/test_TDEM_b_MultiSrc_DerivAdjoint.py
rename to tests/em/tdem/test_TDEM_b_MultiSrc_DerivAdjoint.py
diff --git a/tests/em/test_TDEM_combos.py b/tests/em/tdem/test_TDEM_combos.py
similarity index 100%
rename from tests/em/test_TDEM_combos.py
rename to tests/em/tdem/test_TDEM_combos.py
diff --git a/tests/em/test_TDEM_forward_Analytic.py b/tests/em/tdem/test_TDEM_forward_Analytic.py
similarity index 100%
rename from tests/em/test_TDEM_forward_Analytic.py
rename to tests/em/tdem/test_TDEM_forward_Analytic.py