diff --git a/.travis.yml b/.travis.yml
index f0374cc..fb6860b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,24 @@
-env:
-- TOXENV=py34
-- TOXENV=py33
-- TOXENV=py27
-- TOXENV=py26
-- TOXENV=pypy
-
-install: pip install -U tox
-
 language: python
 
+cache:
+  directories:
+    - .tox
+    - $HOME/.cache/pip
+
 matrix:
   include:
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.4
+      env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+
+install: pip install -U tox
 
 script: tox
-cache:
-  directories:
-    - .tox
-    - $HOME/.cache/pip
 
 deploy:
   provider: pypi
diff --git a/tox.ini b/tox.ini
index f66b93b..a45a306 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, py35
+envlist = py27, py34, py35, py36
 
 [testenv]
 deps =