diff --git a/.travis.yml b/.travis.yml
index c1dd71b..b86103f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,9 @@ env:
   - TOXENV=pypy-django-110
   - TOXENV=pypy-django-111
 matrix:
+  include:
+    - python: 3.6
+      env: TOXENV=py36-django-111
   allow_failures:
     - env: TOXENV=py35-django-master
 script:
diff --git a/tox.ini b/tox.ini
index 7053ac8..23caef6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
 envlist =
-    {py27,py35,pypy}-django-{18,19,110,111}
+    {py27,py35,py36,pypy}-django-{18,19,110,111}
     {py35}-django-master
 
 [testenv]
 basepython =
     py27: python2.7
     py35: python3.5
+    py36: python3.6
     pypy: pypy
 deps =
     redis