diff --git a/requirements.txt b/requirements.txt
index 200d3367af..f68e93ae75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,7 @@ httplib2>=0.7.5 # MIT
 lxml!=3.7.0,>=2.3 # BSD
 passlib>=1.7.0 # BSD
 python-heatclient>=1.6.1 # Apache-2.0
-python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0
 python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
 python-keystoneclient>=3.8.0 # Apache-2.0
 python-swiftclient>=3.2.0 # Apache-2.0
@@ -25,7 +25,7 @@ python-neutronclient>=5.1.0 # Apache-2.0
 python-glanceclient>=2.5.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
-Jinja2>=2.8 # BSD License (3 clause)
+Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
 pexpect!=3.3,>=3.1 # ISC License
 oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
 oslo.context>=2.9.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index db7b528b79..36e260d7c3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,7 +18,7 @@ wsgi-intercept>=1.4.1 # MIT License
 proboscis>=1.2.5.3 # Apache-2.0
 python-troveclient>=2.2.0 # Apache-2.0
 mock>=2.0 # BSD
-mox3>=0.7.0 # Apache-2.0
+mox3!=0.19.0,>=0.7.0 # Apache-2.0
 testtools>=1.4.0 # MIT
 testrepository>=0.0.18 # Apache-2.0/BSD
 pymongo!=3.1,>=3.0.2 # Apache-2.0