diff --git a/.travis.yml b/.travis.yml
index c8192d690..68130a53e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,8 @@ matrix:
           env: TOXENV=py34
         - python: 3.5
           env: TOXENV=py35
+        - python: 3.6
+          env: TOXENV=py36
         - python: pypy
           env: TOXENV=pypy
         - python: pypy3
diff --git a/tox.ini b/tox.ini
index 08b570f64..a607c1162 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    cover,cover3,docs,py26,py27,py32,py33,py34,py35,pypy,pypy3
+    cover,cover3,docs,py26,py27,py32,py33,py34,py35,py36,pypy,pypy3
 
 [testenv]
 deps =