diff --git a/requirements.txt b/requirements.txt
index 4193832e8c..4c4aebd21e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,7 +29,7 @@ oslo.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=1.9.0 # Apache-2.0
 pyScss>=1.3.4 # MIT License
 python-ceilometerclient>=1.0.13
-python-cinderclient>=1.2.2
+python-cinderclient>=1.3.1
 python-glanceclient>=0.18.0
 python-heatclient>=0.3.0
 python-keystoneclient>=1.6.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 1a320400cd..a8550d1a56 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,8 +11,7 @@ hacking<0.11,>=0.10.0
 #
 coverage>=3.6
 django-nose>=1.2
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 mox3>=0.7.0
 nodeenv>=0.9.4 # BSD License
 nose