diff --git a/setup.cfg b/setup.cfg
index 634f12b12..a972bd66f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,3 +12,6 @@ home-page = http://www.openstack.org/
 all_files = 1
 build-dir = doc/build
 source-dir = doc/source
+
+[pbr]
+warnerrors = True
\ No newline at end of file
diff --git a/test-requirements.txt b/test-requirements.txt
index 7425736f0..8e7314b1c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,3 @@
 # needed for doc build
-sphinx>=1.1.2,<1.2
-oslosphinx
+sphinx>=1.1.2,!=1.2.0,<1.3
+oslosphinx>=2.2.0  # Apache-2.0