diff --git a/.travis.yml b/.travis.yml
index 8f1b076..668f9f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ env:
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.9,<1.10"
   - DJANGO="Django>=1.10,<1.11"
+  - DJANGO="Django>=1.11,<1.12"
   - DJANGO="https://github.com/django/django/tarball/master"
 
 matrix:
@@ -35,6 +36,8 @@ matrix:
     env: DJANGO="Django>=1.9,<1.10"
   - python: "3.4"
     env: DJANGO="Django>=1.10,<1.11"
+  - python: "3.4"
+    env: DJANGO="Django>=1.11,<1.12"
 
   - python: "3.3"
     env: DJANGO="Django>=1.4,<1.5"
@@ -42,6 +45,8 @@ matrix:
     env: DJANGO="Django>=1.9,<1.10"
   - python: "3.3"
     env: DJANGO="Django>=1.10,<1.11"
+  - python: "3.3"
+    env: DJANGO="Django>=1.11,<1.12"
   - python: "3.3"
     env: DJANGO="https://github.com/django/django/tarball/master"
 
@@ -51,6 +56,8 @@ matrix:
     env: DJANGO="Django>=1.9,<1.10"
   - python: "3.2"
     env: DJANGO="Django>=1.10,<1.11"
+  - python: "3.2"
+    env: DJANGO="Django>=1.11,<1.12"
   - python: "3.2"
     env: DJANGO="https://github.com/django/django/tarball/master"
 
@@ -62,9 +69,12 @@ matrix:
     env: DJANGO="Django>=1.9,<1.10"
   - python: "2.6"
     env: DJANGO="Django>=1.10,<1.11"
+  - python: "2.6"
+    env: DJANGO="Django>=1.11,<1.12"
   - python: "2.6"
     env: DJANGO="https://github.com/django/django/tarball/master"
   allow_failures:
+    - env: DJANGO="Django>=1.11,<1.12"
     - env: DJANGO="https://github.com/django/django/tarball/master"
 
 before_install:
diff --git a/tox.ini b/tox.ini
index 6a3af4e..70ee0b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
 envlist=
     py26-django{14,15,16},
-    py27-django{14,15,16,17,18,19,110},
+    py27-django{14,15,16,17,18,19,110,111},
     py32-django{15,16,17,18},
     py33-django{15,16,17,18},
-    py34-django{15,16,17,18,19,110},
-    py35-django{18,19,110}
+    py34-django{15,16,17,18,19,110,111},
+    py35-django{18,19,110,111}
     # py33-django-dev,
     docs,
 
@@ -18,6 +18,7 @@ deps =
     django18: Django >= 1.8, < 1.9
     django19: Django >= 1.9, < 1.10
     django110: Django >= 1.10, < 1.11
+    django111: Django >= 1.11, < 1.12
     django-dev: https://github.com/django/django/tarball/master
 commands=
     python runtests.py