diff --git a/requirements.txt b/requirements.txt
index 2c885fad8..ea4c6a314 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,12 +15,12 @@ keystoneauth1>=2.20.0 # Apache-2.0
 keystonemiddleware>=4.12.0 # Apache-2.0
 lxml!=3.7.0,>=2.3 # BSD
 oauth2client!=4.0.0,>=1.5.0 # Apache-2.0
-oslo.config>=3.22.0 # Apache-2.0
+oslo.config>=4.0.0 # Apache-2.0
 oslo.concurrency>=3.8.0 # Apache-2.0
 oslo.context>=2.14.0 # Apache-2.0
 oslo.db>=4.21.1 # Apache-2.0
 oslo.log>=3.22.0 # Apache-2.0
-oslo.messaging>=5.19.0 # Apache-2.0
+oslo.messaging!=5.25.0,>=5.19.0 # Apache-2.0
 oslo.middleware>=3.27.0 # Apache-2.0
 oslo.policy>=1.17.0 # Apache-2.0
 oslo.privsep!=1.17.0,>=1.9.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 304d3365c..cb55211a1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -23,5 +23,5 @@ oslo.versionedobjects[fixtures]>=1.17.0 # Apache-2.0
 os-testr>=0.8.0 # Apache-2.0
 tempest>=14.0.0 # Apache-2.0
 bandit>=1.1.0 # Apache-2.0
-reno>=1.8.0 # Apache-2.0
+reno!=2.3.1,>=1.8.0 # Apache-2.0
 doc8 # Apache-2.0