diff --git a/requirements.txt b/requirements.txt
index 4d451d5..5dfc711 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,8 +9,9 @@
 # PBR should always appear first
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 Babel!=2.4.0,>=2.3.4 # BSD
-Django<2.0,>=1.8 # BSD
-django-babel>=0.5.1 # BSD
+Django<2,>=1.11;python_version<'3.0' # BSD
+Django<2.1,>=1.11;python_version>='3.0'  # BSD
+django-babel>=0.6.2 # BSD
 django-compressor>=2.0 # MIT
 django-pyscss>=2.0.2 # BSD License (2 clause)
 python-karborclient>=0.6.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 82d06d7..c93c9b2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,7 +21,7 @@ nosexcover>=1.0.10 # BSD
 openstack.nose-plugin>=0.7 # Apache-2.0
 oslosphinx>=4.7.0 # Apache-2.0
 selenium>=2.50.1 # Apache-2.0
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 testtools>=2.2.0 # MIT
 # This also needs xvfb library installed on your OS
 xvfbwrapper>=0.1.3 #license: MIT