diff --git a/.travis.yml b/.travis.yml
index 0705506f..c4bd33ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@ python:
 sudo: false
 
 env:
-    - TEST_DIR=tests/em
+    - TEST_DIR=tests/em/examples
+    - TEST_DIR=tests/em/fdem
+    - TEST_DIR=tests/em/tdem
     - TEST_DIR=tests/mesh
     - TEST_DIR=tests/flow
     - TEST_DIR=tests/utils
diff --git a/tests/em_examples/__init__.py b/tests/em/examples/__init__.py
similarity index 100%
rename from tests/em_examples/__init__.py
rename to tests/em/examples/__init__.py
diff --git a/tests/em_examples/test_Examples.py b/tests/em/examples/test_Examples.py
similarity index 100%
rename from tests/em_examples/test_Examples.py
rename to tests/em/examples/test_Examples.py
diff --git a/tests/em_fdem/__init__.py b/tests/em/fdem/__init__.py
similarity index 100%
rename from tests/em_fdem/__init__.py
rename to tests/em/fdem/__init__.py
diff --git a/tests/em_fdem/test_FDEM.py b/tests/em/fdem/test_FDEM.py
similarity index 100%
rename from tests/em_fdem/test_FDEM.py
rename to tests/em/fdem/test_FDEM.py
diff --git a/tests/em_fdem/test_FDEMCasing.py b/tests/em/fdem/test_FDEMCasing.py
similarity index 100%
rename from tests/em_fdem/test_FDEMCasing.py
rename to tests/em/fdem/test_FDEMCasing.py
diff --git a/tests/em_fdem/test_FDEM_analytics.py b/tests/em/fdem/test_FDEM_analytics.py
similarity index 100%
rename from tests/em_fdem/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
similarity index 100%
rename from tests/em_tdem/__init__.py
rename to tests/em/tdem/__init__.py
diff --git a/tests/em_tdem/test_TDEM_b_DerivAdjoint.py b/tests/em/tdem/test_TDEM_b_DerivAdjoint.py
similarity index 100%
rename from tests/em_tdem/test_TDEM_b_DerivAdjoint.py
rename to tests/em/tdem/test_TDEM_b_DerivAdjoint.py
diff --git a/tests/em_tdem/test_TDEM_b_MultiSrc_DerivAdjoint.py b/tests/em/tdem/test_TDEM_b_MultiSrc_DerivAdjoint.py
similarity index 100%
rename from tests/em_tdem/test_TDEM_b_MultiSrc_DerivAdjoint.py
rename to tests/em/tdem/test_TDEM_b_MultiSrc_DerivAdjoint.py
diff --git a/tests/em_tdem/test_TDEM_combos.py b/tests/em/tdem/test_TDEM_combos.py
similarity index 100%
rename from tests/em_tdem/test_TDEM_combos.py
rename to tests/em/tdem/test_TDEM_combos.py
diff --git a/tests/em_tdem/test_TDEM_forward_Analytic.py b/tests/em/tdem/test_TDEM_forward_Analytic.py
similarity index 100%
rename from tests/em_tdem/test_TDEM_forward_Analytic.py
rename to tests/em/tdem/test_TDEM_forward_Analytic.py