diff --git a/requirements.txt b/requirements.txt
index 4518cede78..e56504068a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ eventlet>=0.17.4
 greenlet>=0.3.2
 iso8601>=0.1.9
 jsonpatch>=1.1
-keystonemiddleware>=1.5.0
+keystonemiddleware>=2.0.0
 netaddr>=0.7.12
 oslo.concurrency>=2.1.0 # Apache-2.0
 oslo.config>=1.11.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 259f190432..3d2a7332c4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,7 @@ coverage>=3.6
 discover
 fixtures>=1.3.1
 hacking<0.11,>=0.10.0 # Apache-2.0
-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'
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.7.0 # Apache-2.0