diff --git a/.travis.yml b/.travis.yml
index 916c2af..de121ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,17 +3,27 @@ env:
   - DJANGO_VERSION=1.8.0
   - DJANGO_VERSION=1.9.0
   - DJANGO_VERSION=1.10.0
+  - DJANGO_VERSION=1.11.0
 python:
   - "2.7"
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 matrix:
   exclude:
     - python: "3.3"
       env: "DJANGO_VERSION=1.9.0"
     - python: "3.3"
       env: "DJANGO_VERSION=1.10.0"
+    - python: "3.3"
+      env: "DJANGO_VERSION=1.11.0"
+    - python: "3.6"
+      env: "DJANGO_VERSION=1.8.0"
+    - python: "3.6"
+      env: "DJANGO_VERSION=1.9.0"
+    - python: "3.6"
+      env: "DJANGO_VERSION=1.10.0"
 install:
   - pip install django~=$DJANGO_VERSION
   - pip install .
diff --git a/overextends/tests.py b/overextends/tests.py
index 2752ece..f88fece 100644
--- a/overextends/tests.py
+++ b/overextends/tests.py
@@ -91,7 +91,7 @@ class Tests(TestCase):
         with self.modify_settings(INSTALLED_APPS={
                     'prepend': self.test_apps
                 }):
-            html = get_template(self.unique_id).render(Context())
+            html = get_template(self.unique_id).render({})
             previous = ""
             for test_string in ["project"] + self.test_apps:
                 self.assertTrue(test_string in html)
diff --git a/setup.py b/setup.py
index c4e0ac7..780509e 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ setup(
     include_package_data = True,
     packages = find_packages(),
     install_requires = [
-        "django >= 1.8, < 1.11",
+        "django >= 1.8, < 2.0",
     ],
     extras_require = {
         'dev': [
@@ -28,10 +28,13 @@ setup(
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Framework :: Django",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Internet :: WWW/HTTP :: Site Management",
diff --git a/test_project/urls.py b/test_project/urls.py
index 8b13789..637600f 100644
--- a/test_project/urls.py
+++ b/test_project/urls.py
@@ -1 +1 @@
-
+urlpatterns = []