diff --git a/setup.cfg b/setup.cfg
index e6c2fdab9b2..43fedcca55b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -159,6 +159,7 @@ tempest.test_plugins =
 all_files = 1
 build-dir = doc/build
 source-dir = doc/source
+warning-is-error = 1
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
@@ -176,10 +177,3 @@ input_file = neutron/locale/neutron.pot
 
 [wheel]
 universal = 1
-
-# NOTE(ihrachys): disable until a new pbr release is released that will
-# actually make the flag effective. Otherwise, we may be broken by the next pbr
-# release. More info at:
-# http://lists.openstack.org/pipermail/openstack-dev/2016-June/097849.html
-#[pbr]
-#warnerrors = true