diff --git a/.gitignore b/.gitignore
index 57a43108..f0a19a1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,8 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+AUTHORS
+ChangeLog
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..35a43bf7
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,8 @@
+# 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.
+
+openstackdocstheme>=1.17.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
+reno>=2.5.0 # Apache-2.0
+sphinxcontrib-httpdomain>=1.3.0  # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 0eb220f7..fd815534 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,9 +21,6 @@ nose-exclude>=0.3.0 # LGPL
 nosehtmloutput>=0.0.3 # Apache-2.0
 nosexcover>=1.0.10 # BSD
 openstack.nose-plugin>=0.7 # Apache-2.0
-openstackdocstheme>=1.17.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
 testtools>=2.2.0 # MIT
 # This also needs xvfb library installed on your OS
 http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
diff --git a/tox.ini b/tox.ini
index c9a13b17..9b703fe8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -91,9 +91,11 @@ commands =
   {[unit_tests]commands}
 
 [testenv:docs]
+deps = -r{toxinidir}/doc/requirements.txt
 commands = python setup.py build_sphinx
 
 [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
 
 [hacking]