diff --git a/.travis.yml b/.travis.yml
index 866cf96..52a6f85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,14 @@
 language: python
 
 python:
+  - 3.6
   - 3.5
   - 3.4
   - 3.3
   - 2.7
 
 env:
+  - DJANGO="Django>=1.11,<1.12"
   - DJANGO="Django>=1.10,<1.11"
   - DJANGO="Django>=1.9,<1.10"
   - DJANGO="Django>=1.8,<1.9"
@@ -22,6 +24,15 @@ script: coverage run -a --source=logexpose logexpose/runtests.py
 matrix:
 
   exclude:
+   - python: 3.6
+     env: DJANGO="Django>=1.7,<1.8"
+   - python: 3.6
+     env: DJANGO="Django>=1.6,<1.7"
+   - python: 3.6
+     env: DJANGO="Django>=1.5,<1.6"
+   - python: 3.6
+     env: DJANGO="Django>=1.4,<1.5"
+
    - python: 3.5
      env: DJANGO="Django>=1.7,<1.8"
    - python: 3.5
@@ -34,6 +45,8 @@ matrix:
    - python: 3.4
      env: DJANGO="Django>=1.4,<1.5"
 
+   - python: 3.3
+     env: DJANGO="Django>=1.11,<1.12"
    - python: 3.3
      env: DJANGO="Django>=1.10,<1.11"
    - python: 3.3
diff --git a/tox.ini b/tox.ini
index ba5e7e0..a2940ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,11 @@
 [tox]
-envlist = py{27,32,33,34}-django{15,16,17,18,19,110}
-          py{35}-django{18,19,110}
+envlist = py{27,32,33,34}-django{15,16,17,18,19,110,111}
+          py{35,26}-django{18,19,110,111}
 
 install_command = pip install {opts} {packages}
 skip_missing_interpreters = True
 
 [testenv]
-basepython =
-    py27: python2.7
-    py32: python3.2
-    py33: python3.3
-    py34: python3.4
-    py35: python3.5
-
 commands = python logexpose/runtests.py
 
 deps =
@@ -23,3 +16,4 @@ 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