diff --git a/requirements.txt b/requirements.txt
index 2dfd129f..0c5dceb3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 PrettyTable<0.8,>=0.7.1 # BSD
 requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
 simplejson>=2.2.0 # MIT
-oslo.i18n>=2.1.0 # Apache-2.0
+oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
 oslo.utils>=3.20.0 # Apache-2.0
 Babel!=2.4.0,>=2.3.4 # BSD
 keystoneauth1>=2.20.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 764d5cd5..57411a65 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,13 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-coverage>=4.0 # Apache-2.0
+coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0
 requests-mock>=1.1 # Apache-2.0
-sphinx>=1.5.1 # BSD
+sphinx!=1.6.1,>=1.5.1 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT