diff --git a/requirements.txt b/requirements.txt
index 2ff7881541..1b02260e65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,6 +37,6 @@ Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT
 six>=1.9.0 # MIT
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
 stevedore>=1.10.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
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
 WebOb>=1.2.3 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 4dea62a9f4..47f8ed393b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,7 @@ bashate>=0.2 # Apache-2.0
 coverage>=3.6 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
-mock>=1.2 # BSD
+mock>=2.0 # BSD
 iso8601>=0.1.11 # MIT
 oslotest>=1.10.0 # Apache-2.0
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
@@ -24,7 +24,7 @@ psycopg2>=2.5 # LGPL/ZPL
 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
-os-testr>=0.4.1 # Apache-2.0
+os-testr>=0.7.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=0.2.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT