diff --git a/docs/development.rst b/docs/development.rst
index 828c3be..cda7739 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -76,10 +76,7 @@ Testing uses `tox <https://pypi.python.org/pypi/tox>`_. If you don't want to
 install all the development requirements, then, after downloading, you can
 simply run::
 
-    $ python setup.py test
-
-The test argument to setup.py will download a minimal testing infrastructure
-and run the tests.
+    $ tox
 
 ::
 
diff --git a/setup.py b/setup.py
index 841dfb9..9ba37f2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,22 +1,8 @@
 from setuptools import setup
-from setuptools.command.test import test as TestCommand
 
 import diskcache
 
 
-class Tox(TestCommand):
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        import tox
-
-        errno = tox.cmdline(self.test_args)
-        exit(errno)
-
-
 with open('README.rst', encoding='utf-8') as reader:
     readme = reader.read()
 
@@ -36,8 +22,6 @@ def run_tests(self):
     },
     license='Apache 2.0',
     packages=['diskcache'],
-    tests_require=['tox'],
-    cmdclass={'test': Tox},
     python_requires='>=3',
     install_requires=[],
     classifiers=(