diff --git a/requirements.txt b/requirements.txt
index 9335b34a..b9c4ee3f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ oslo.db>=1.12.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.6.0 # Apache-2.0
 oslo.messaging>=1.16.0 # Apache-2.0
-oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+oslo.middleware>=2.4.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
@@ -30,7 +30,7 @@ paramiko>=1.13.0
 Paste
 PasteDeploy>=1.5.0
 python-neutronclient<3,>=2.3.11
-keystonemiddleware>=1.5.0
+keystonemiddleware>=2.0.0
 requests>=2.5.2
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
 Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
diff --git a/test-requirements.txt b/test-requirements.txt
index d0ef4404..44936d3e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ coverage>=3.6
 ddt>=0.7.0
 discover
 fixtures>=1.3.1
-mock>=1.1;python_version!='2.6'
+mock!=1.1.4,>=1.1;python_version!='2.6'
 mock==1.0.1;python_version=='2.6'
 PyMySQL>=0.6.2 # MIT License
 oslotest>=1.7.0 # Apache-2.0