diff --git a/requirements.txt b/requirements.txt
index 0d4c53b08..e04e52439 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,12 +10,12 @@ keystonemiddleware>=4.12.0 # Apache-2.0
 lxml!=3.7.0,>=2.3 # BSD
 oslo.concurrency>=3.8.0 # Apache-2.0
 oslo.cache>=1.5.0 # Apache-2.0
-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.policy>=1.17.0 # Apache-2.0
 oslo.reports>=0.6.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
@@ -30,10 +30,10 @@ voluptuous>=0.8.9 # BSD License
 gnocchiclient>=2.7.0 # Apache-2.0
 python-ceilometerclient>=2.5.0 # Apache-2.0
 python-cinderclient>=2.1.0 # Apache-2.0
-python-glanceclient>=2.5.0 # Apache-2.0
+python-glanceclient>=2.7.0 # Apache-2.0
 python-keystoneclient>=3.8.0 # Apache-2.0
 python-monascaclient>=1.1.0 # Apache-2.0
-python-neutronclient>=5.1.0 # Apache-2.0
+python-neutronclient>=6.3.0 # Apache-2.0
 python-novaclient>=7.1.0 # Apache-2.0
 python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0
 python-ironicclient>=1.11.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index c92e888f3..c703509d9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,14 +15,14 @@ testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 
 # Doc requirements
-openstackdocstheme>=1.5.0  # Apache-2.0
+openstackdocstheme>=1.5.0 # Apache-2.0
 oslosphinx>=4.7.0 # Apache-2.0
 sphinx!=1.6.1,>=1.5.1 # BSD
 sphinxcontrib-pecanwsme>=0.8 # Apache-2.0
 
 
 # releasenotes
-reno>=1.8.0 # Apache-2.0
+reno!=2.3.1,>=1.8.0 # Apache-2.0
 
 # bandit
 bandit>=1.1.0 # Apache-2.0