diff --git a/.travis.yml b/.travis.yml
index a34c4c6..286bf45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,7 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
 install: pip install tox-travis
 script: tox
diff --git a/tox.ini b/tox.ini
index 78801f0..d44a961 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,22 +1,13 @@
 [tox]
-envlist = py26, py27, py31, py32, py33, py34
+envlist = py26, py27, py31, py32, py33, py34, py35, py36
+
+[testenv]
+commands = python -m unittest discover
 
 [testenv:py26]
 commands = python -m discover
 deps = discover
 
-[testenv:py27]
-commands = python -m unittest discover
-
 [testenv:py31]
 commands = python -m discover
 deps = discover
-
-[testenv:py32]
-commands = python -m unittest discover
-
-[testenv:py33]
-commands = python -m unittest discover
-
-[testenv:py34]
-commands = python -m unittest discover