diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..43a43787
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,6 @@
+# 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.
+# needed for doc build
+sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.25.1  # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 122289c4..ad281220 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # needed for doc build
-sphinx>=1.6.2 # BSD
-openstackdocstheme>=1.25.1  # Apache-2.0
 hacking<0.12,>=0.11.0 # Apache-2.0
 yamllint
 mock>=2.0.0 # BSD
diff --git a/tox.ini b/tox.ini
index cf0faf32..0ec50b19 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,10 @@ commands = yamllint configuration.yaml
 commands = {posargs}
 
 [testenv:docs]
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -v -W -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:ci-checks-review]