diff --git a/.travis.yml b/.travis.yml
index 2c0963b..9d36276 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
 sudo: false
 language: python
 python:
-  - 2.6
-  - 2.7
-  - 3.3
-  - 3.4
-  - 3.5
+  - '2.6'
+  - '2.7'
+  - '3.3'
+  - '3.4'
+  - '3.5'
+  - '3.6'
 install:
   - pip install -U pip wheel setuptools
   - pip install tox tox-travis
diff --git a/tox.ini b/tox.ini
index c0282d9..2ea6a28 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,27 +1,23 @@
 [tox]
 envlist =
-    python35-django110, python35-django19, python35-django18
-    python34-django110, python34-django19, python34-django18, python34-django17
-    python33-django18, python33-django17, python33-django16
-    python27-django110, python27-django19, python27-django18, python27-django17, python27-django16, python27-django15, python27-django14,
-    python26-django16, python26-django15, python26-django14
+    py36-{django110,django19,django18}
+    py35-{django110,django19,django18}
+    py34-{django110,django19,django18,django17}
+    py33-{django18,django17,django16}
+    py27-{django110,django19,django18,django17,django16,django15,django14}
+    py26-{django16,django15,django14}
 
 [tox:travis]
-2.6 = python26
-2.7 = python27
-3.3 = python33
-3.4 = python34
-3.5 = python35
+2.6 = py26
+2.7 = py27
+3.3 = py33
+3.4 = py34
+3.5 = py35
+3.6 = py36
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}
 commands = python setup.py test
-basepython =
-    python26: python2.6
-    python27: python2.7
-    python33: python3.3
-    python34: python3.4
-    python35: python3.5
 deps =
     django14: Django>=1.4,<1.5
     django15: Django>=1.5,<1.6