diff --git a/setup.cfg b/setup.cfg
index 95bcc5f..a825598 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,6 +25,22 @@ classifier =
 packages =
     pankoclient
 
+[extras]
+test =
+    coverage>=4.0 # Apache-2.0
+    hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
+    mock>=2.0 # BSD
+    python-openstackclient>=3.3.0 # Apache-2.0
+    python-subunit>=0.0.18 # Apache-2.0/BSD
+    oslotest>=1.10.0 # Apache-2.0
+    reno>=1.8.0 # Apache-2.0
+    requests-mock>=1.1 # Apache-2.0
+    testrepository>=0.0.18 # Apache-2.0/BSD
+    testscenarios>=0.4 # Apache-2.0/BSD
+doc =
+    sphinx!=1.3b1,!=1.6.1,>=1.2.1 # BSD
+    oslosphinx>=4.7.0 # Apache-2.0
+
 [entry_points]
 openstack.cli.extension =
     event = pankoclient.osc.plugin
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index b583e89..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-coverage>=4.0 # Apache-2.0
-hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
-mock>=2.0 # BSD
-python-openstackclient>=3.3.0 # Apache-2.0
-python-subunit>=0.0.18 # Apache-2.0/BSD
-oslosphinx>=4.7.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
-reno>=1.8.0 # Apache-2.0
-requests-mock>=1.1 # Apache-2.0
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
-testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 7f375de..72f54bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,13 +8,15 @@ usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/test-requirements.txt
+deps = .[test]
 commands = python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
 commands = flake8 {posargs}
 
 [testenv:venv]
+# Used by openstack-infra to build the doc
+deps = .[doc]
 commands = {posargs}
 
 [testenv:cover]
@@ -23,7 +25,10 @@ commands =
   coverage report
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps = .[doc]
+commands =
+  rm -rf doc/source/ref
+  python setup.py build_sphinx
 
 [testenv:releasenotes]
 commands =
@@ -33,9 +38,6 @@ commands =
 commands = oslo_debug_helper -t pankoclient/tests {posargs}
 
 [flake8]
-# E123, E125 skipped as they are invalid PEP-8.
-
 show-source = True
-ignore = E123,E125
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build