diff --git a/requirements.txt b/requirements.txt
index 8842251..162fa79 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@
 # 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
-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)
+PyYAML>=3.10.0 # MIT
+netifaces>=0.10.4 # MIT
+pbr>=2.0.0 # Apache-2.0
 pykube
 python-etcd>=0.4.3 # MIT License
-PyYAML>=3.10.0 # MIT
 six>=1.9.0 # MIT
-netifaces>=0.10.4 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 60c1484..2089e20 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,11 +4,12 @@
 
 hacking<0.11,>=0.10.0
 
-coverage>=3.6 # Apache-2.0
-python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+coverage>=4.0 # Apache-2.0
+flake8>=2.5.4,<2.6.0  # MIT
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx>=1.5.1 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT