diff --git a/requirements.txt b/requirements.txt
index 95efa5e..355b717 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ greenlet>=0.3.2 # MIT
 httplib2>=0.7.5 # MIT
 requests>=2.10.0 # Apache-2.0
 Jinja2>=2.8 # BSD License (3 clause)
-keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
+keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
 netaddr!=0.7.16,>=0.7.12 # BSD
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
@@ -36,10 +36,10 @@ oslo.rootwrap>=2.0.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.10.0 # Apache-2.0
 oslo.utils>=3.5.0 # Apache-2.0
-oslo.versionedobjects!=1.9.0,>=1.5.0 # Apache-2.0
+oslo.versionedobjects>=1.9.1 # Apache-2.0
 sqlalchemy-migrate>=0.9.6 # Apache-2.0
 python-openstackclient>=2.1.0 # Apache-2.0
 python-neutronclient>=4.2.0 # Apache-2.0
-python-cinderclient>=1.6.0 # Apache-2.0
+python-cinderclient!=1.7.0,>=1.6.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
 python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 1bebcad..1c27be8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,8 @@
 
 cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
 coverage>=3.6 # Apache-2.0
-fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
-mock>=1.2 # BSD
+fixtures>=3.0.0 # Apache-2.0/BSD
+mock>=2.0 # BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=0.7.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
@@ -16,7 +16,7 @@ testresources>=0.2.4 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 WebTest>=2.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
-os-testr>=0.4.1 # Apache-2.0
+os-testr>=0.7.0 # Apache-2.0
 tempest-lib>=0.14.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 pylint==1.4.5 # GNU GPL v2