diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..f41f72e
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+sphinx>=2.0.0,!=2.1.0 # BSD
+reno>=3.1.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 2c1f0e2..da16c0a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,8 +11,4 @@ stestr>=1.0.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 
-# documentation
 doc8>=0.8.1 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0 # BSD
-reno>=3.1.0 # Apache-2.0
-openstackdocstheme>=2.2.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index e9d5c40..f89529c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,18 +58,22 @@ usedevelop = False
 commands = bandit -r monascaclient -n5 -x {env:OS_TEST_PATH}
 
 [testenv:docs]
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/doc/requirements.txt
 description = Builds full monascaclient documentation
 commands =
   {[testenv:devdocs]commands}
   {[testenv:releasenotes]commands}
 
 [testenv:devdocs]
+deps = {[testenv:docs]deps}
 description = Builds developer documentation
 commands =
   rm -rf {toxinidir}/doc/build {toxinidir}/doc/source/contributor/api
   sphinx-build -a -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
+deps = {[testenv:docs]deps}
 description = Called from CI script to test and publish the Release Notes
 commands =
   rm -rf releasenotes/build