diff --git a/setup.py b/setup.py
index 4c74e17..3d1e380 100644
--- a/setup.py
+++ b/setup.py
@@ -44,8 +44,6 @@ setup(
     ],
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
-    test_suite='tests.runtests.main',
-    tests_require=['django-discover-runner', 'django-picklefield', 'redis'],
     install_requires=['six'],
     zip_safe=False,
     extras_require={
diff --git a/tests/runtests.py b/tests/runtests.py
deleted file mode 100755
index ab3e18b..0000000
--- a/tests/runtests.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-from django.core.management import call_command
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
-
-
-def main():
-    result = call_command('test', 'tests', verbosity=2)
-    sys.exit(result)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tox.ini b/tox.ini
index d339d56..ae86f10 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,11 @@ basepython =
     py34: python3.4
     pypy: pypy
 deps =
+    redis
+    coverage
+    django-picklefield
     py26: unittest2
+    django-{14,15}: django-discover-runner
     django-14: Django>=1.4,<1.5
     django-15: Django>=1.5,<1.6
     django-16: Django>=1.6,<1.7
@@ -18,4 +22,5 @@ deps =
     django-master: https://github.com/django/django/archive/master.zip
 usedevelop = true
 commands =
-    python setup.py test
+    coverage run `which django-admin.py` test --settings=tests.settings -v2
+    coverage report