diff --git a/setup.cfg b/setup.cfg
index 219da7e..305b72a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,13 +49,13 @@ packages =
 [test]
 # py.test options when running `python setup.py test`
 addopts = 
-  wafo/test
-  wafo/covariance/test
-  wafo/spectrum/test
-  # wafo/stats/tests
-  wafo/covariance/test
-  wafo/transform/test
-  wafo/wave_theory/test
+  wafo/tests
+  wafo/covariance/tests
+  wafo/spectrum/tests
+  wafo/covariance/tests
+  wafo/transform/tests
+  wafo/wave_theory/tests
+# wafo/stats/tests
 
 [pytest]
 # Options for py.test:
diff --git a/wafo/covariance/test/__init__.py b/wafo/covariance/tests/__init__.py
similarity index 100%
rename from wafo/covariance/test/__init__.py
rename to wafo/covariance/tests/__init__.py
diff --git a/wafo/covariance/test/conftest.py b/wafo/covariance/tests/conftest.py
similarity index 100%
rename from wafo/covariance/test/conftest.py
rename to wafo/covariance/tests/conftest.py
diff --git a/wafo/covariance/test/test_covariance.py b/wafo/covariance/tests/test_covariance.py
similarity index 100%
rename from wafo/covariance/test/test_covariance.py
rename to wafo/covariance/tests/test_covariance.py
diff --git a/wafo/spectrum/test/__init__.py b/wafo/spectrum/tests/__init__.py
similarity index 100%
rename from wafo/spectrum/test/__init__.py
rename to wafo/spectrum/tests/__init__.py
diff --git a/wafo/spectrum/test/conftest.py b/wafo/spectrum/tests/conftest.py
similarity index 100%
rename from wafo/spectrum/test/conftest.py
rename to wafo/spectrum/tests/conftest.py
diff --git a/wafo/spectrum/test/test_models.py b/wafo/spectrum/tests/test_models.py
similarity index 100%
rename from wafo/spectrum/test/test_models.py
rename to wafo/spectrum/tests/test_models.py
diff --git a/wafo/spectrum/test/test_specdata1d.py b/wafo/spectrum/tests/test_specdata1d.py
similarity index 100%
rename from wafo/spectrum/test/test_specdata1d.py
rename to wafo/spectrum/tests/test_specdata1d.py
diff --git a/wafo/test/__init__.py b/wafo/tests/__init__.py
similarity index 100%
rename from wafo/test/__init__.py
rename to wafo/tests/__init__.py
diff --git a/wafo/test/conftest.py b/wafo/tests/conftest.py
similarity index 100%
rename from wafo/test/conftest.py
rename to wafo/tests/conftest.py
diff --git a/wafo/test/test_gaussian.py b/wafo/tests/test_gaussian.py
similarity index 100%
rename from wafo/test/test_gaussian.py
rename to wafo/tests/test_gaussian.py
diff --git a/wafo/test/test_integrate.py b/wafo/tests/test_integrate.py
similarity index 100%
rename from wafo/test/test_integrate.py
rename to wafo/tests/test_integrate.py
diff --git a/wafo/test/test_kdetools.py b/wafo/tests/test_kdetools.py
similarity index 100%
rename from wafo/test/test_kdetools.py
rename to wafo/tests/test_kdetools.py
diff --git a/wafo/test/test_misc.py b/wafo/tests/test_misc.py
similarity index 100%
rename from wafo/test/test_misc.py
rename to wafo/tests/test_misc.py
diff --git a/wafo/test/test_numpy_utils.py b/wafo/tests/test_numpy_utils.py
similarity index 100%
rename from wafo/test/test_numpy_utils.py
rename to wafo/tests/test_numpy_utils.py
diff --git a/wafo/test/test_objects.py b/wafo/tests/test_objects.py
similarity index 100%
rename from wafo/test/test_objects.py
rename to wafo/tests/test_objects.py
diff --git a/wafo/test/test_padua.py b/wafo/tests/test_padua.py
similarity index 100%
rename from wafo/test/test_padua.py
rename to wafo/tests/test_padua.py
diff --git a/wafo/transform/test/__init__.py b/wafo/transform/tests/__init__.py
similarity index 100%
rename from wafo/transform/test/__init__.py
rename to wafo/transform/tests/__init__.py
diff --git a/wafo/transform/test/conftest.py b/wafo/transform/tests/conftest.py
similarity index 100%
rename from wafo/transform/test/conftest.py
rename to wafo/transform/tests/conftest.py
diff --git a/wafo/transform/test/test_models.py b/wafo/transform/tests/test_models.py
similarity index 100%
rename from wafo/transform/test/test_models.py
rename to wafo/transform/tests/test_models.py
diff --git a/wafo/transform/test/test_trdata.py b/wafo/transform/tests/test_trdata.py
similarity index 100%
rename from wafo/transform/test/test_trdata.py
rename to wafo/transform/tests/test_trdata.py
diff --git a/wafo/wave_theory/test/__init__.py b/wafo/wave_theory/tests/__init__.py
similarity index 100%
rename from wafo/wave_theory/test/__init__.py
rename to wafo/wave_theory/tests/__init__.py
diff --git a/wafo/wave_theory/test/conftest.py b/wafo/wave_theory/tests/conftest.py
similarity index 100%
rename from wafo/wave_theory/test/conftest.py
rename to wafo/wave_theory/tests/conftest.py
diff --git a/wafo/wave_theory/test/test_dispersion_relation.py b/wafo/wave_theory/tests/test_dispersion_relation.py
similarity index 100%
rename from wafo/wave_theory/test/test_dispersion_relation.py
rename to wafo/wave_theory/tests/test_dispersion_relation.py