diff --git a/setup.py b/setup.py
index 971c4c5..0da9cf5 100755
--- a/setup.py
+++ b/setup.py
@@ -96,4 +96,4 @@ setuptools.setup(
     install_requires=[
         'pycrypto >= 2.5'
     ],
-    cmdclass={'test': TestCommand, 'sdist': eo_sdist})
+)
diff --git a/tests/paybox.py b/tests/test_paybox.py
similarity index 100%
rename from tests/paybox.py
rename to tests/test_paybox.py
diff --git a/tests/sips2.py b/tests/test_sips2.py
similarity index 100%
rename from tests/sips2.py
rename to tests/test_sips2.py
diff --git a/tests/spplus.py b/tests/test_spplus.py
similarity index 100%
rename from tests/spplus.py
rename to tests/test_spplus.py
diff --git a/tox.ini b/tox.ini
index e1f6a26..72cd3f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,8 @@
 [testenv]
 # django.contrib.auth is not tested it does not work with our templates
 commands =
-    coverage erase
-    coverage run --source=. -a ./setup.py test
-    coverage xml
+  py.test --junitxml=junit.xml --cov-report xml --cov=eopayment/ tests
 usedevelop = True
 deps = coverage
+  pytest
+  pytest-cov