diff --git a/Makefile b/Makefile
index e6c4a1e8e..335ad1909 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ clean-test:
 	rm -fr htmlcov/
 
 test:
-	python setup.py test --pytest-args="tests django_extensions --ds=tests.testapp.settings --cov=django_extensions"
+	python setup.py test
 
 coverage:
 	coverage run --source django_extensions setup.py test
diff --git a/setup.py b/setup.py
index 35b24a104..0e19a9426 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ class PyTest(TestCommand):
 
         def initialize_options(self):
             TestCommand.initialize_options(self)
-            self.pytest_args = []
+            self.pytest_args = 'tests django_extensions --ds=tests.testapp.settings --cov=django_extensions'
 
         def finalize_options(self):
             TestCommand.finalize_options(self)