diff --git a/setup.cfg b/setup.cfg
index 51b1b7caa..f5bda4954 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -83,15 +83,6 @@ oslo.config.opts =
 [wheel]
 universal = 1
 
-[build_sphinx]
-warning-is-error = 1
-all-files = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = oslo_messaging/locale
 domain = oslo_messaging
diff --git a/tox.ini b/tox.ini
index d772882a6..03d01c295 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,8 +28,8 @@ commands = {posargs}
 
 [testenv:docs]
 basepython = python2.7
-commands = python setup.py build_sphinx
 deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:py27-func-rabbit]
 setenv =