diff --git a/requirements.txt b/requirements.txt
index 250966471..97431ac15 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,22 +2,22 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6 # Apache-2.0
+pbr>=1.8 # Apache-2.0
 Babel>=2.3.4 # BSD
 lxml>=2.3 # BSD
 python-ceilometerclient>=2.5.0 # Apache-2.0
 python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
 python-dateutil>=2.4.2 # BSD
-python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0
+python-keystoneclient>=3.6.0 # Apache-2.0
 python-neutronclient>=5.1.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
-python-heatclient>=1.5.0 # Apache-2.0
+python-heatclient!=1.6.0,>=1.5.0 # Apache-2.0
 pyzabbix>=0.7.4 # LGPL
 networkx>=1.10 # BSD
-oslo.config>=3.14.0 # Apache-2.0
+oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
 oslo.messaging>=5.2.0 # Apache-2.0
 oslo.log>=3.11.0 # Apache-2.0
-oslo.policy>=1.14.0 # Apache-2.0
+oslo.policy>=1.15.0 # Apache-2.0
 oslo.service>=1.10.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index bdb0f2b17..c1f19b1b7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,14 +4,14 @@
 
 hacking<0.11,>=0.10.0
 python-dateutil>=2.4.2 # BSD
-coverage>=3.6 # Apache-2.0
+coverage>=4.0 # Apache-2.0
 lxml>=2.3 # BSD
 networkx>=1.10 # BSD
 python-ceilometerclient>=2.5.0 # Apache-2.0
 python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
 python-neutronclient>=5.1.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
-python-heatclient>=1.5.0 # Apache-2.0
+python-heatclient!=1.6.0,>=1.5.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 pyzabbix>=0.7.4 # LGPL
 sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
@@ -19,10 +19,10 @@ oslo.log>=3.11.0 # Apache-2.0
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 oslo.service>=1.10.0 # Apache-2.0
-oslo.config>=3.14.0 # Apache-2.0
+oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
 oslo.messaging>=5.2.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
-oslo.policy>=1.14.0 # Apache-2.0
+oslo.policy>=1.15.0 # Apache-2.0
 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
 tempest-lib>=0.14.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
@@ -31,4 +31,4 @@ testtools>=1.4.0 # MIT
 stevedore>=1.17.1 # Apache-2.0
 voluptuous>=0.8.9 # BSD License
 sympy>=0.7.6 # BSD
-reno>=1.8.0 # Apache2
+reno>=1.8.0 # Apache-2.0