diff --git a/requirements.txt b/requirements.txt
index 1dc087242b..6b6ede36ce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,12 +11,12 @@ eventlet!=0.18.3,<0.21.0,>=0.18.2 # MIT
 greenlet>=0.3.2 # MIT
 lxml!=3.7.0,>=2.3 # BSD
 netaddr!=0.7.16,>=0.7.13 # BSD
-oslo.config>=3.22.0 # Apache-2.0
+oslo.config>=4.0.0 # Apache-2.0
 oslo.context>=2.14.0 # Apache-2.0
 oslo.db>=4.21.1 # Apache-2.0
 oslo.i18n!=3.15.2,>=2.1.0 # 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.24.2 # Apache-2.0
 oslo.middleware>=3.27.0 # Apache-2.0
 oslo.policy>=1.17.0 # Apache-2.0
 oslo.rootwrap>=5.0.0 # Apache-2.0
@@ -28,7 +28,7 @@ paramiko>=2.0 # LGPLv2.1+
 Paste # MIT
 PasteDeploy>=1.5.0 # MIT
 pyparsing>=2.1.0 # MIT
-python-neutronclient>=5.1.0 # Apache-2.0
+python-neutronclient>=6.3.0 # Apache-2.0
 keystoneauth1>=2.20.0 # Apache-2.0
 keystonemiddleware>=4.12.0 # Apache-2.0
 requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index aa099b2229..717b2eb72b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -30,5 +30,5 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=0.2.4 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
-reno>=1.8.0 # Apache-2.0
+reno!=2.3.1,>=1.8.0 # Apache-2.0
 doc8 # Apache-2.0