diff --git a/setup.cfg b/setup.cfg
index c997a87c..820266e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -78,9 +78,3 @@ doc =
 
 [wheel]
 universal = 1
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
diff --git a/tox.ini b/tox.ini
index 6075d1de..dfaccb8a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,7 @@ commands = python setup.py testr --slowest --coverage --testr-args="{posargs}"
 
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pep8]
 deps = hacking<0.13,>=0.12