diff --git a/requirements.txt b/requirements.txt
index 220e3dd15..ec09c4bbb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=2.0.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
 appdirs>=1.3.0 # MIT License
 dogpile.cache>=0.6.2 # BSD
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index b8ccd8d39..5e2af1e62 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ doc8 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 requests-mock>=1.1 # Apache-2.0
 mock>=2.0 # BSD
-Babel>=2.3.4 # BSD
+Babel!=2.4.0,>=2.3.4 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 reno>=1.8.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0