diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 000000000..054442998
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1 @@
+sphinx>=1.5.1 # BSD
diff --git a/setup.cfg b/setup.cfg
index d98b2b995..7de5acaff 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -66,12 +66,3 @@ kayobe.cli=
     seed_service_deploy = kayobe.cli.commands:SeedServiceDeploy
     seed_vm_deprovision = kayobe.cli.commands:SeedVMDeprovision
     seed_vm_provision = kayobe.cli.commands:SeedVMProvision
-
-[build_sphinx]
-all-files = 1
-warning-is-error = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
diff --git a/test-requirements.txt b/test-requirements.txt
index f71fae41c..c4ae1e80b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,5 +10,6 @@ docker<3 # Apache-2.0
 hacking>=0.12.0,<0.13 # Apache-2.0
 molecule<3 # MIT
 oslotest>=1.10.0 # Apache-2.0
+# NOTE(mgoddard): This is required by tools/sphinx8.
 sphinx>=1.5.1 # BSD
 stestr # Apache-2.0
diff --git a/tox.ini b/tox.ini
index aac53e972..c0ee49fc7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
+install_command = pip install {opts} {packages}
 passenv =
     HOME
 whitelist_externals =
@@ -16,7 +16,10 @@ setenv =
    OS_STDOUT_CAPTURE=1
    OS_STDERR_CAPTURE=1
    OS_TEST_TIMEOUT=60
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
@@ -36,7 +39,6 @@ usedevelop = True
 # Create the virtualenv with access to system site packages, as this is
 # required to use the python and apt modules, which are not available via PyPI.
 sitepackages = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
 commands =
     # Install ansible role dependencies from Galaxy.
     ansible-galaxy install \
@@ -45,7 +47,6 @@ commands =
     {toxinidir}/tools/test-ansible.sh {posargs}
 
 [testenv:molecule]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
 commands =
     # Install ansible role dependencies from Galaxy.
     ansible-galaxy install \
@@ -89,7 +90,11 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:debug]
 commands = oslo_debug_helper {posargs}