diff --git a/.travis.yml b/.travis.yml
index 538d1ac99..dd5722fe2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,40 @@
 language: python
 sudo: false
-python: 3.5
 cache: pip
-env:
-  - TOXENV="py27-dj18"
-  - TOXENV="py33-dj18"
-  - TOXENV="py34-dj18"
-  - TOXENV="py27-dj19"
-  - TOXENV="py27-dj110"
-  - TOXENV="py34-dj19"
-  - TOXENV="py34-dj110"
-  - TOXENV="py35-dj19"
-  - TOXENV="py35-dj110"
-  - TOXENV="flake8"
-  - TOXENV="isort"
-  - TOXENV="readme"
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27-dj18
+    - python: 3.3
+      env: TOXENV=py33-dj18
+    - python: 3.4
+      env: TOXENV=py34-dj18
+    - python: 2.7
+      env: TOXENV=py27-dj19
+    - python: 3.4
+      env: TOXENV=py34-dj19
+    - python: 3.5
+      env: TOXENV=py35-dj19
+    - python: 2.7
+      env: TOXENV=py27-dj110
+    - python: 3.4
+      env: TOXENV=py34-dj110
+    - python: 3.5
+      env: TOXENV=py35-dj110
+    - python: 2.7
+      env: TOXENV=py27-dj111
+    - python: 3.4
+      env: TOXENV=py34-dj111
+    - python: 3.5
+      env: TOXENV=py35-dj111
+    - python: 3.6
+      env: TOXENV=py36-dj111
+    - python: 2.7
+      env: TOXENV=flake8
+    - python: 2.7
+      env: TOXENV=isort
+    - python: 2.7
+      env: TOXENV=readme
 install:
   - pip install tox codecov
 script:
diff --git a/setup.py b/setup.py
index 98f234fba..cd8649040 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
@@ -37,6 +38,7 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )
diff --git a/tox.ini b/tox.ini
index f3ee3dd2a..d24a67de3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
 [tox]
 envlist =
     py{27,33,34}-dj18,
-    py{27,34,35}-dj{19,110},
+    py{27,34,35}-dj{19,110,111},
+    py36-dj111
     flake8,
     isort,
     readme
@@ -12,10 +13,12 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 deps =
     dj18: Django>=1.8,<1.9
     dj19: Django>=1.9,<1.10
-    dj110: Django>=1.10a,<1.11
+    dj110: Django>=1.10,<1.11
+    dj111: Django>=1.11,<2.0
     coverage
     selenium<4.0
     sqlparse