diff --git a/requirements.txt b/requirements.txt
index b8b29311ed..60093ff6a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,12 +23,12 @@ kombu>=3.0.7
 pycrypto>=2.6
 iso8601>=0.1.9
 oslo.config>=1.11.0 # Apache-2.0
-oslo.concurrency>=2.1.0 # Apache-2.0
+oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.service>=0.1.0 # Apache-2.0
 oslo.utils>=1.9.0 # Apache-2.0
 stevedore>=1.5.0 # Apache-2.0
-taskflow>=0.11.0
+taskflow>=1.16.0
 keystonemiddleware>=2.0.0
 WSME>=0.7
 # For openstack/common/lockutils
@@ -38,7 +38,7 @@ posix-ipc
 python-swiftclient>=2.2.0
 
 # For VMware storage backed.
-oslo.vmware>=0.13.1 # Apache-2.0
+oslo.vmware>=1.16.0 # Apache-2.0
 
 # For paste.util.template used in keystone.common.template
 Paste
@@ -52,7 +52,7 @@ six>=1.9.0
 oslo.db>=1.12.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.6.0 # Apache-2.0
-oslo.messaging>=1.16.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
 oslo.middleware>=2.4.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 436e3d72d2..3616091645 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,8 +13,7 @@ coverage>=3.6
 discover
 fixtures>=1.3.1
 mox3>=0.7.0
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 requests>=2.5.2
 testrepository>=0.0.18