diff --git a/requirements.txt b/requirements.txt
index e8fc1d3e4..56ffb41d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ pbr>=2.0.0 # Apache-2.0
 Babel>=2.3.4 # BSD
 lxml!=3.7.0,>=2.3 # BSD
 python-ceilometerclient>=2.5.0 # Apache-2.0
-python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
+python-cinderclient>=2.0.1 # Apache-2.0
 python-dateutil>=2.4.2 # BSD
 python-keystoneclient>=3.8.0 # Apache-2.0
 python-neutronclient>=5.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 0d4616f2a..a6f50e24c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ coverage>=4.0 # Apache-2.0
 lxml!=3.7.0,>=2.3 # BSD
 networkx>=1.10 # BSD
 python-ceilometerclient>=2.5.0 # Apache-2.0
-python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
+python-cinderclient>=2.0.1 # Apache-2.0
 python-neutronclient>=5.1.0 # Apache-2.0
 python-novaclient>=7.1.0 # Apache-2.0
 python-heatclient>=1.6.1 # Apache-2.0