diff --git a/.travis.yml b/.travis.yml
index ce922f4..c1be998 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,17 @@
 language: python
-python: 2.7
 sudo: false
 cache: pip
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=py36
-  - TOXENV=pypy
+python:
+  - "2.6"
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "pypy"
   # Don't test this until fixed by travis
-  # - TOXENV=pypy3
-  - TOXENV=docs
-  - TOXENV=lint
+  # "pypy3"
 install:
-  - pip install tox
+  - pip install tox-travis
 script:
   - tox
diff --git a/tox.ini b/tox.ini
index ebdb1e8..99e6f9f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,9 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, py36, pypy, pypy3, docs, flakes
+envlist = py26, py27, py33, py34, py35, py36, pypy, pypy3, docs, lint
+
+[travis]
+python =
+    2.7: py27, docs, lint
 
 [testenv]
 deps =