diff --git a/requirements.txt b/requirements.txt
index 09c5d6a2d..dc7e2abcd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 requests>=2.14.2 # Apache-2.0
-Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
+Jinja2>=2.10 # BSD License (3 clause)
 netaddr>=0.7.18 # BSD
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 alembic>=0.8.10 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index ac19c26d3..a23fd4f12 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ flake8-import-order==0.12 # LGPLv3
 mock>=2.0.0 # BSD
 pylint==1.4.5 # GPLv2
 requests-mock>=1.1.0 # Apache-2.0
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,<1.7.0,>=1.6.2 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 tempest>=17.1.0 # Apache-2.0
 testtools>=2.2.0 # MIT