diff --git a/Makefile b/Makefile
index a7a8002..9a99247 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,3 @@
 test:
-	django-admin.py test --settings=compressor.test_settings compressor
+	coverage run --branch --source=compressor `which django-admin.py` test --settings=compressor.test_settings compressor
+	coverage report --omit=compressor/test*
diff --git a/compressor/test_settings.py b/compressor/test_settings.py
index edd6ffa..fc6b1f6 100644
--- a/compressor/test_settings.py
+++ b/compressor/test_settings.py
@@ -17,7 +17,6 @@ else:
 
 INSTALLED_APPS = [
     'compressor',
-    'django_nose',
 ]
 
 MEDIA_URL = '/media/'
@@ -33,6 +32,6 @@ TEMPLATE_DIRS = (
     os.path.join(TEST_DIR, 'test_templates'),
 )
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+TEST_RUNNER = 'discover_runner.DiscoverRunner'
 
 SECRET_KEY = "iufoj=mibkpdz*%bob952x(%49rqgv8gg45k36kjcg76&-y5=!"
diff --git a/requirements/tests.txt b/requirements/tests.txt
index f5f3ba5..6c27e19 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -1,5 +1,5 @@
 flake8
-django-nose
+django-discover-runner
 coverage
 unittest2
 BeautifulSoup==3.2.0
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index a9b6ffa..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[nosetests]
-with-coverage=1
-cover-package=compressor