diff --git a/.travis.yml b/.travis.yml
index 94f3ed7..4357bfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
   - TOXENV=py33
   - TOXENV=py34
   - TOXENV=py35
+  - TOXENV=py36
 
 install:
   - pip install -U tox
diff --git a/tox.ini b/tox.ini
index 1d51c08..719cca9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35, pypy
+envlist = py27, py33, py34, py35, py36, pypy
 skipsdist = true
 
 [testenv]