diff --git a/requirements.txt b/doc/requirements.txt
similarity index 74%
rename from requirements.txt
rename to doc/requirements.txt
index 76c36ad06..c19963ecb 100644
--- a/requirements.txt
+++ b/doc/requirements.txt
@@ -1,9 +1,6 @@
 # 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.
-
 oslosphinx>=4.7.0 # Apache-2.0
-sphinx>=1.5.1,!=1.6.1 # BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 yasfb>=0.5.1,!=0.6.0
diff --git a/setup.cfg b/setup.cfg
index ef197bfad..94adcd6c3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,12 +11,5 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
 
-[build_sphinx]
-builders = html
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
 [wheel]
 universal = 1
diff --git a/test-requirements.txt b/test-requirements.txt
index ca0193569..e5b90654c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,3 +4,5 @@
 
 hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
diff --git a/tox.ini b/tox.ini
index a43d117bb..98c71240e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,20 +6,19 @@ skipsdist = True
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
 install_command = pip install -U {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+deps = -r{toxinidir}/doc/requirements.txt
 whitelist_externals = find
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:docs]
-basepython = python2.7
-commands =
-  find . -type f -name "*.pyc" -delete
-  python setup.py build_sphinx
+commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:pep8]
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+  -r{toxinidir}/doc/requirements.txt
+  -r{toxinidir}/test-requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
   python setup.py testr --slowest --testr-args='{posargs}'