diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000000..6354511f45
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,7 @@
+# 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.
+sphinx>=1.6.2 # BSD
+sphinxcontrib-blockdiag>=1.1.0
+oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.17.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 2363612449..0000000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-sphinx>=1.5.1,!=1.6.1 # BSD
-sphinxcontrib-blockdiag>=1.1.0
-oslosphinx>=4.7.0 # Apache-2.0
-pbr>=3.0.0 # Apache-2.0
-openstackdocstheme>=1.16.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 17de54d784..a738e33349 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,13 +4,18 @@ envlist = docs
 skipsdist = True
 
 [testenv]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
+install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/test-requirements.txt
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
 passenv = *_proxy *_PROXY
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+commands =
+  bash -c "rm -rf doc/build"
+  python setup.py build_sphinx
+whitelist_externals =
+  bash