diff --git a/.travis.yml b/.travis.yml
index 8d00e01..887f235 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,10 @@ matrix:
       env: TOX_ENV=py33
     - python: 3.4
       env: TOX_ENV=py34
+    - python: 3.5
+      env: TOX_ENV=py35
+    - python: 3.6
+      env: TOX_ENV=py36
     - python: 2.6
       env: TOX_ENV=squeeze
     - python: 2.7
diff --git a/tox.ini b/tox.ini
index 06d29de..5b8b90a 100755
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35
+envlist = py27,py33,py34,py35,py36
 
 [testenv]
 deps =