diff --git a/setup.cfg b/setup.cfg
index a493d50f..048ca821 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,9 +22,6 @@ classifier =
 packages =
     oslo_service
 
-[pbr]
-warnerrors = true
-
 [entry_points]
 oslo.config.opts =
     oslo.service.periodic_task = oslo_service.periodic_task:list_opts
@@ -33,9 +30,9 @@ oslo.config.opts =
     oslo.service.wsgi = oslo_service.wsgi:list_opts
 
 [build_sphinx]
+warning-is-error = 1
 source-dir = doc/source
 build-dir = doc/build
-all_files = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html