diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..606e173a
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,15 @@
+# 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.
+
+# For generating sphinx documentation
+openstackdocstheme>=1.17.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
+reno>=2.5.0 # Apache-2.0
+python-memcached>=1.56 # PSF
+pymongo!=3.1,>=3.0.2 # Apache-2.0
+etcd3gw>=0.2.0 # Apache-2.0
+
+# For autodoc builds
+mock>=2.0.0 # BSD
+oslotest>=1.10.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 966aa98b..4c12a853 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,9 +4,6 @@
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 mock>=2.0.0 # BSD
 oslotest>=1.10.0 # Apache-2.0
-openstackdocstheme>=1.17.0 # Apache-2.0
 pifpaf>=0.10.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
-reno>=2.5.0 # Apache-2.0
 # Bandit security code scanner
 bandit>=1.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index a7e5ec64..244772f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,8 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:cover]
 commands = python setup.py testr --coverage --testr-args='{posargs}'
@@ -61,4 +62,5 @@ deps = pip_missing_reqs
 commands = pip-missing-reqs -d --ignore-module=oslo_cache* --ignore-file=oslo_cache/tests/* --ignore-file=tests/ oslo_cache
 
 [testenv:releasenotes]
+deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html