diff --git a/requirements.txt b/requirements.txt
index 5ab15d7d3b..67663fe71d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,7 +25,7 @@ oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=1.12.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.2.0 # Apache-2.0
-oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslo.messaging>=1.16.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
 oslo.service>=0.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 283f707f69..f48d83ab12 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,8 @@ coverage>=3.6
 discover
 fixtures>=1.3.1
 hacking<0.11,>=0.10.0 # Apache-2.0
-mock>=1.0
+mock>=1.1;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.5.1 # Apache-2.0
 python-subunit>=0.0.18