diff --git a/requirements.txt b/requirements.txt
index b2904f991b..5f4738e7a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ croniter>=0.3.4 # MIT License
 cryptography>=1.0 # Apache-2.0
 eventlet>=0.17.4
 greenlet>=0.3.2
-keystonemiddleware>=2.0.0
+keystonemiddleware!=2.4.0,>=2.0.0
 kombu>=3.0.7
 lxml>=2.3
 netaddr!=0.7.16,>=0.7.12
@@ -19,8 +19,8 @@ oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=2.4.1 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.8.0 # Apache-2.0
-oslo.messaging!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1,>=1.16.0 # Apache-2.0
-oslo.middleware>=2.8.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1,!=2.7.0,!=2.8.0,!=2.8.1,!=2.9.0,!=3.1.0,>=1.16.0 # Apache-2.0
+oslo.middleware!=3.0.0,!=3.1.0,!=3.2.0,>=2.8.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.reports>=0.1.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
@@ -36,7 +36,7 @@ python-cinderclient>=1.3.1
 python-designateclient>=1.0.0
 python-glanceclient>=0.18.0
 python-heatclient>=0.3.0
-python-keystoneclient>=1.6.0
+python-keystoneclient!=1.8.0,>=1.6.0
 python-magnumclient>=0.2.1
 python-manilaclient>=1.3.0
 python-mistralclient>=1.0.0
@@ -48,7 +48,7 @@ python-troveclient>=1.2.0
 python-zaqarclient>=0.1.1
 pytz>=2013.6
 PyYAML>=3.1.0
-requests!=2.8.0,>=2.5.2
+requests!=2.8.0,!=2.9.0,>=2.5.2
 Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
 Routes!=2.0,>=1.12.3;python_version!='2.7'
 six>=1.9.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e345f476a1..443625f83c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,7 +15,7 @@ oslotest>=1.10.0 # Apache-2.0
 paramiko>=1.13.0
 qpid-python;python_version=='2.7'
 psycopg2>=2.5
-reno[sphinx]>=0.1.1  # Apache2
+reno>=0.1.1 # Apache2
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
 testscenarios>=0.4