diff --git a/requirements.txt b/requirements.txt
index 62bcfe3870..e287406274 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,6 +15,6 @@ oslo.utils>=3.5.0 # Apache-2.0
 python-glanceclient>=2.0.0 # Apache-2.0
 python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
-python-cinderclient!=1.7.0,>=1.6.0 # Apache-2.0
+python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
 requests>=2.10.0 # Apache-2.0
 stevedore>=1.10.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index ffc8326079..a8d6aa47e4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,14 +5,14 @@ hacking<0.11,>=0.10.0
 
 coverage>=3.6 # Apache-2.0
 discover # BSD
-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
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 reno>=1.6.2 # Apache2
 requests-mock>=0.7.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
-os-testr>=0.4.1 # Apache-2.0
+os-testr>=0.7.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 tempest>=11.0.0 # Apache-2.0