diff --git a/requirements.txt b/requirements.txt
index 37e5e3da2322e2089ce5214f4999f2a998edd0a4..cbd9a1cf15133468e246bb8fb7d95b2ff0db7213 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ six>=1.9.0 # MIT
 oslo.concurrency>=3.8.0 # Apache-2.0
 oslo.config>=4.0.0 # Apache-2.0
 oslo.context>=2.14.0 # Apache-2.0
-oslo.messaging>=5.19.0 # Apache-2.0
+oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.utils>=3.20.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 49ffadfbfb493d3b205f1c41a2e9abc6eb27fc66..3cd1f5613dcdbd9a396edda4955849d176dd47c8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,4 +10,4 @@ sphinx!=1.6.1,>=1.5.1 # BSD
 
 coverage!=4.4,>=4.0 # Apache-2.0
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
-reno>=1.8.0 # Apache-2.0
+reno!=2.3.1,>=1.8.0 # Apache-2.0