diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..9bb66955
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1 @@
+zuul-sphinx>=0.2.0
diff --git a/setup.cfg b/setup.cfg
index 55506702..59d6d166 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,9 +13,3 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-
-[build_sphinx]
-all-files = 1
-warning-is-error = 1
-source-dir = doc/source
-build-dir = doc/build
diff --git a/test-requirements.txt b/test-requirements.txt
index 1e6cac18..da63a2dd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,4 +8,3 @@ zuul
 ansible>=2.7.0,<2.8
 ansible-lint<4
 bashate>=0.2
-zuul-sphinx>=0.2.0
diff --git a/tox.ini b/tox.ini
index 31415805..e7160dca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,10 @@ deps = bindep
 commands = bindep test
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps =
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:linters]
 whitelist_externals = bash