diff --git a/requirements.txt b/requirements.txt
index 05071537..88a2bfe9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ Babel>=1.3
 oslo.concurrency>=2.1.0 # Apache-2.0
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.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.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=1.9.0 # Apache-2.0
 iso8601>=0.1.9
diff --git a/setup.cfg b/setup.cfg
index 2e5e74df..95106801 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,8 +24,7 @@ packages =
 
 [extras]
 fixtures =
-  mock!=1.1.4,>=1.1:python_version!='2.6'
-  mock==1.0.1:python_version=='2.6'
+  mock>=1.2
   fixtures>=1.3.1
 
 [pbr]