diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..26e9264e
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,8 @@
+# Notes:
+# reno needs openstackdocstheme which needs reno (cycle dep).
+# os-api-ref needs openstackdocstheme which needs os-api-ref (cycle dep).
+# Put them in here will make it clear that those are only needed for
+# docs.
+
+os-api-ref>=1.4.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index a7d82eb2..ef7ed82a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,15 +19,6 @@ classifier =
     Programming Language :: Python :: 3.5
     Topic :: Documentation
 
-[extras]
-test =
-  os-api-ref>=1.4.0 # Apache-2.0
-  reno>=2.5.0 # Apache-2.0
-# Notes:
-# reno needs openstackdocstheme which needs reno (cycle dep).
-# os-api-ref needs openstackdocstheme which needs os-api-ref (cycle dep).
-# Put them in extras to make it an optional test dependency.
-
 [global]
 setup-hooks =
     pbr.hooks.setup_hook
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index e61b63a8..00000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE="$1"
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ "$CONSTRAINTS_FILE" != http* ]]; then
-    CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
-
-pip install -c"$localfile" openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints "$localfile" -- "$CLIENT_NAME"
-
-pip install -c"$localfile" -U "$@"
-exit $?
diff --git a/tox.ini b/tox.ini
index d8dec64c..4d6e6fec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,12 +4,12 @@ envlist = pep8
 
 [testenv]
 usedevelop = False
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps = -r{toxinidir}/test-requirements.txt
-    .[test]
-setenv = VIRTUAL_ENV={envdir}
-         BRANCH_NAME=master
-         CLIENT_NAME=openstackdocstheme
+install_command = pip install -U {opts} {packages}
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/doc/requirements.txt
 sitepackages = False
 whitelist_externals =
   rm