diff --git a/Makefile b/Makefile
index 16cc9179..674b32e8 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr htmlcov/
 
 test :
-	$(PYTHON) setup.py test
+	pytest
 	$(MAKE) -C test test
 
 upload : test
diff --git a/requirements.txt b/requirements.txt
index 4a81f733..8d961408 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
 pylama==7.7.1
-pytest==5.2.2; python_version >= '3.0'
-pytest-runner==5.2
+pytest
 tox==3.14.0
diff --git a/setup.py b/setup.py
index f00ceb43..217e2fbd 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,6 @@
 requirements = []
 test_requirements = ['pytest', 'pylama']
 needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
-setup_requirements = ['pytest-runner'] if needs_pytest else []
 extra_requirements = {'proxy': ['PySocks']}
 
 setup(
@@ -52,6 +51,5 @@
     ],
     test_suite='tests',
     tests_require=test_requirements,
-    setup_requires=setup_requirements,
     extras_require=extra_requirements
 )
diff --git a/tox.ini b/tox.ini
index 7a84245c..4074f760 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ commands =
     # $EXCLUDE is defined above in testenv:py27 as a workaround for Python 2
     # which does not support asyncio and type hints
     flake8 . --count --select=E9,F63,F7,F822,F823 --show-source --statistics {env:EXCLUDE:}
-    python setup.py test
+    pytest
     make -C test test
     # TODO (cclauss) Fix up all these undefined names
     flake8 . --count --exit-zero --select=F821 --show-source --statistics