diff --git a/setup.cfg b/setup.cfg
index e3bca223d..f1b3f2a96 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,11 +34,6 @@ tag_build =
 tag_date = 0
 tag_svn_revision = 0
 
-[build_sphinx]
-all_files = 1
-build-dir = docs/build
-source-dir = docs
-
 [pbr]
 warnerrors = True
 autodoc_tree_index_modules = True
diff --git a/tox.ini b/tox.ini
index 618dfe255..1f4bfcdaa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ setenv = NOSE_WITH_COVERAGE=1
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -a -E -W -d docs/build/doctrees -b html docs/source docs/build/html
 
 [testenv:releasenotes]
 deps = -r{toxinidir}/test-requirements.txt