diff --git a/.travis.yml b/.travis.yml
index 7a91af809..d7f0f8f97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
     - "2.7"
     - "3.4"
     - "3.5"
+    - "3.6"
 
 sudo: false
 
diff --git a/tox.ini b/tox.ini
index 698a0b745..e7be8c436 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,8 @@ addopts=--tb=short
 
 [tox]
 envlist =
-       {py27,py33,py34,py35}-django18,
-       {py27,py34,py35}-django{19,110},
+       {py27,py33,py34,py35,py36}-django18,
+       {py27,py34,py35,py36}-django{19,110},
        {py27,py34,py35,py36}-django111,
        {py35,py36}-djangomaster
        lint,docs