diff --git a/requirements.txt b/requirements.txt
index bf4ebda5..61eef9bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ pbr>=1.6
 Django<1.9,>=1.7
 oslo.config>=2.3.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
-python-keystoneclient!=1.8.0,>=1.6.0
+python-keystoneclient!=1.8.0,<3.0.0,>=1.6.0
 six>=1.9.0
diff --git a/test-requirements.txt b/test-requirements.txt
index ca74a875..eb2d7539 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
-Babel>=1.3
+Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,>=1.3 # BSD
 coverage>=3.6
 mock>=1.2
 mox3>=0.7.0