diff --git a/.travis.yml b/.travis.yml
index 8c58412e..d8e17093 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,24 @@
 sudo: false
 language: python
-python:
-- '3.5'
-- '3.6'
-install: pip install tox-travis
-script: tox
+cache:
+  directories:
+    - $HOME/.cache/pip
+matrix:
+  include:
+    - env: TOX_ENV=py35
+      python: 3.5
+    - env: TOX_ENV=py35-no-ext
+      python: 3.5
+    - env: TOX_ENV=py36
+      python: 3.6
+    - env: TOX_ENV=py36-no-ext
+      python: 3.6
+    - env: TOX_ENV=flake8
+      python: 3.6
+    - env: TOX_ENV=check
+      python: 3.6
+install: pip install -U tox
+script: tox -e $TOX_ENV
 deploy:
   provider: pypi
   user: channelcat
diff --git a/tox.ini b/tox.ini
index 498bfae4..b391c06e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,6 @@
 [tox]
 envlist = py35, py36, {py35,py36}-no-ext, flake8, check
 
-[travis]
-python =
-    3.5: py35, py35-no-ext, flake8, check
-    3.6: py36, py36-no-ext, flake8, check
-
 [testenv]
 usedevelop = True
 setenv =