diff --git a/Makefile b/Makefile
index 2765ad93..51c5f8c6 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ docs:
 
 
 test:
-	PYTHONASYNCIODEBUG=1 $(PYTHON) setup.py test
-	$(PYTHON) setup.py test
+	PYTHONASYNCIODEBUG=1 $(PYTHON) -m unittest -v tests.suite
+	$(PYTHON) -m unittest -v tests.suite
 
 
 testinstalled:
diff --git a/setup.py b/setup.py
index f6621226..eae49108 100644
--- a/setup.py
+++ b/setup.py
@@ -316,7 +316,6 @@ def build_extensions(self):
         'Intended Audience :: Developers',
     ],
     include_package_data=True,
-    test_suite='tests.suite',
     extras_require=EXTRA_DEPENDENCIES,
     setup_requires=setup_requires
 )