diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 000000000..92009cfb4
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+Pillow>=2.4.0 # PIL License
diff --git a/test-requirements.txt b/test-requirements.txt
index b17775d9e..c2df18d7e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,8 @@
 # needed for doc build
 docutils>=0.11,!=0.13.1  # OSI-Approved Open Source, Public Domain
-openstackdocstheme>=2.2.1 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0 # BSD
 PyYAML>=3.1.0
 yamllint>=0.5.2
 requests-cache
-Pillow>=2.4.0 # PIL License
 hacking>=3.0.1,<3.1.0 # Apache-2.0
 whereto>=0.3.0  # Apache-2.0
 
diff --git a/tox.ini b/tox.ini
index ba671ac84..7ec0d6f2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,6 +54,8 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:validate]