diff --git a/.travis.yml b/.travis.yml
index 28a66f4..6ebf078 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: python
 sudo: false
 
 python:
-  - "3.5"
+  - "3.6"
 
 env:
   - TOX_ENV=py27-django18
@@ -18,9 +18,14 @@ env:
   - TOX_ENV=py34-django110
   - TOX_ENV=py35-django110
 
-  - TOX_ENV=py27-djangomaster
+  - TOX_ENV=py27-django111
+  - TOX_ENV=py34-django111
+  - TOX_ENV=py35-django111
+  - TOX_ENV=py36-django111
+
   - TOX_ENV=py34-djangomaster
   - TOX_ENV=py35-djangomaster
+  - TOX_ENV=py36-djangomaster
 
 cache:
   - pip
diff --git a/setup.py b/setup.py
index 672919c..6bf2f4f 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,8 @@
         "Framework :: Django :: 1.7",
         "Framework :: Django :: 1.8",
         "Framework :: Django :: 1.9",
+        "Framework :: Django :: 1.10",
+        "Framework :: Django :: 1.11",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2.7",
diff --git a/tox.ini b/tox.ini
index 2909c9d..be222f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,8 @@ envlist =
        {py27,py34,py35}-django18,
        {py27,py34,py35}-django19,
        {py27,py34,py35}-django110,
-       {py27,py34,py35}-django{master}
+       {py27,py34,py35,py36}-django111,
+       {py34,py35,py36}-django{master}
 
 [testenv]
 commands = python runtests.py
@@ -14,12 +15,14 @@ setenv =
        PYTHONDONTWRITEBYTECODE=1
        PYTHONWARNINGS=once
 deps =
-        django18: Django==1.8.14
-        django19: Django==1.9.9
-        django110: Django==1.10
+        django18: Django>=1.8,<1.9
+        django19: Django>=1.9,<1.10
+        django110: Django>=1.10,<1.11
+        django111: Django>=1.11,<2.0
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
 basepython =
+    py36: python3.6
     py35: python3.5
     py34: python3.4
     py27: python2.7