diff --git a/.travis.yml b/.travis.yml
index f02d7c1a..cff15f91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,9 @@
 language: python
 script: tox
 install:
-  - pip install tox
-env:
-  - TOXENV=py27
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=py36
-  - TOXENV=docs
+  - pip install tox-travis
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
diff --git a/tox.ini b/tox.ini
index e7af9ccb..ddef0a1a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,3 +26,10 @@ deps =
 [flake8]
 exclude = migrations
 max_line_length = 100
+
+[travis]
+python =
+  2.7: py27
+  3.4: py34
+  3.5: py35
+  3.6: py36, docs, lint