diff --git a/requirements.txt b/requirements.txt
index 4dc84ee..acf8cf6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 # Horizon Core Requirements
-Django<1.10,>=1.8 # BSD
+Django<2.0,>=1.8 # BSD
 django-compressor>=2.0 # MIT
 django-openstack-auth>=3.1.0 # Apache-2.0
 httplib2>=0.7.5 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 6ca32cd..804e464 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,6 +21,6 @@ testtools>=1.4.0 # MIT
 xvfbwrapper>=0.1.3 #license: MIT
 
 # Doc requirements
-openstackdocstheme>=1.11.0  # Apache-2.0
+openstackdocstheme>=1.11.0 # Apache-2.0
 sphinx>=1.6.2 # BSD
-reno>=1.8.0 # Apache-2.0
+reno!=2.3.1,>=1.8.0 # Apache-2.0