diff --git a/setup.cfg b/setup.cfg
index 7fe2e24b..d3ed9288 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,9 +26,6 @@ packages =
 fixtures =
   fixtures>=3.0.0 # Apache-2.0/BSD
 
-[pbr]
-warnerrors = true
-
 [entry_points]
 oslo.config.opts =
     oslo.log = oslo_log._options:list_opts
@@ -36,9 +33,10 @@ console_scripts =
     convert-json = oslo_log.cmds.convert_json:main
 
 [build_sphinx]
+all-files = 1
+warning-is-error = 1
 source-dir = doc/source
 build-dir = doc/build
-all_files = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html