diff --git a/setup.cfg b/setup.cfg
index 84abef1f..0657bf9f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,15 +26,6 @@ packages =
 oslo.config.opts =
     oslo.versionedobjects = oslo_versionedobjects._options:list_opts
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = oslo_versionedobjects/locale
 domain = oslo_versionedobjects
diff --git a/tox.ini b/tox.ini
index 930cacfd..7e99d0c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ commands = {posargs}
 
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -b html doc/source doc/build/html
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:cover]
 commands = python setup.py test --coverage --coverage-package-name=oslo_versionedobjects --testr-args='{posargs}'