diff --git a/setup.cfg b/setup.cfg
index 278485f..89b5356 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,13 +36,6 @@ stevedore.test.extension =
     e1 = stevedore.tests.test_extension:BrokenExtension
     e2 = stevedore.tests.notfound:UnimportableExtension
 
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
 [pbr]
 warnerrors = True
 
diff --git a/tox.ini b/tox.ini
index a8cb3a6..d6bd257 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ commands =
 
 [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
 
 [flake8]
 ignore = E251