diff --git a/.travis.yml b/.travis.yml
index 581d0a8..c4d30ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
+  - "3.6"
 
 env:
   - DJANGO="Django>=1.8,<1.9"
diff --git a/tox.ini b/tox.ini
index b1c3ce5..8caea5c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{27,34,35}-django-{18,19,110}
-    py{27,35}-flake8
+    py{27,34,35,36}-django-{18,19,110}
+    py{27,35,36}-flake8
     isort
 
 [testenv]