diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 000000000..1f13e4c13
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+sphinx>=2.0  # BSD
+openstack-doc-tools>=1.8.0 # Apache-2.0
+os-service-types
diff --git a/test-requirements.txt b/test-requirements.txt
index 9ca3a4d63..8a9639874 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,12 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 pbr>=2.0.0,!=2.1.0  # Apache-2.0
-
-sphinx>=2.0  # BSD
-
-openstack-doc-tools>=1.8.0 # Apache-2.0
 Jinja2>=2.10
 
 requests
-os-service-types
 lxml!=3.7.0,>=3.4.1 # BSD
diff --git a/tox.ini b/tox.ini
index 569ab01d9..aa017dcd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,13 +17,17 @@ whitelist_externals =
 [testenv:venv]
 commands = {posargs}
 
+[testenv:docs]
+deps =
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/doc/requirements.txt
+commands =
+  {toxinidir}/tools/build-index.sh
+
 [testenv:publishdocs]
+deps = {[testenv:docs]deps}
 # Prepare documents (without www) so that they can get published on
 # developer.openstack.org with just copying publish-docs/api-ref over.
 commands =
   # Build website index
   {toxinidir}/tools/build-index.sh
-
-[testenv:docs]
-commands =
-  {toxinidir}/tools/build-index.sh