diff --git a/setup.cfg b/setup.cfg
index 1448e7086..280606f89 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -188,6 +188,7 @@ nova.scheduler.driver =
 all_files = 1
 build-dir = doc/build
 source-dir = doc/source
+warning-is-error = 1
 
 [build_apiguide]
 all_files = 1
@@ -219,8 +220,3 @@ universal = 1
 [extras]
 osprofiler =
   osprofiler>=1.4.0 # Apache-2.0
-
-[pbr]
-# Treat sphinx warnings as errors during the docs build; this helps us keep
-# the documentation clean.
-warnerrors = true