diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index eca6a01ac95..7c8a90c6b1d 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -116,7 +116,7 @@ These are the basic steps needed to start developing on Sphinx.
 
    * Run the unit tests::
 
-       pip install -r test-reqs.txt
+       pip install .[test,websupport]
        make test
 
    * Again, it's useful to turn on deprecation warnings on so they're shown in
diff --git a/MANIFEST.in b/MANIFEST.in
index 1530c28cd63..a5699c23c50 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,7 +12,6 @@ include sphinx-autogen.py
 include sphinx-build.py
 include sphinx-quickstart.py
 include sphinx-apidoc.py
-include test-reqs.txt
 include tox.ini
 include sphinx/locale/.tx/config
 
diff --git a/test-reqs.txt b/test-reqs.txt
deleted file mode 100644
index be15ff1abfd..00000000000
--- a/test-reqs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-flake8
-pytest>=3.0
-pytest-cov
-html5lib
-mock;python_version<'3.3'
-mypy;python_version>='3.2'
-typed_ast;python_version>='3.2'
diff --git a/tox.ini b/tox.ini
index d78754dd4c5..00b3c99e2fa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,12 @@ envlist=flake8,mypy,py{27,34,35,36},pypy,du{11,12,13,14}
 
 [testenv]
 passenv = https_proxy http_proxy no_proxy
-deps=-rtest-reqs.txt
+# TODO(stephenfin) Replace this with the 'extras' config option when tox 2.4 is
+# widely available, likely some time after the Ubuntu 18.04 release
+#
+# https://tox.readthedocs.io/en/latest/config.html#confval-extras=MULTI-LINE-LIST
+deps =
+    .[test,websupport]
 setenv =
     SPHINX_TEST_TEMPDIR = {envdir}/testbuild
 commands=