diff --git a/.travis.yml b/.travis.yml
index 81d97160..8fc11294 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,6 @@
-dist: trusty
-sudo: false
 language: python
-
-python:
-    - "2.7"
-    - "3.4"
-    - "3.5"
-    - "3.6"
-
-install:
-  - pip install tox-travis python-coveralls
-
+cache:
+    pip: true
 addons:
     apt:
        packages:
@@ -20,8 +10,37 @@ addons:
            - myspell-de-de
            - myspell-nl
 
+install:
+  - pip install tox python-coveralls
+
 script:
   - tox
 
+matrix:
+  include:
+    - { python: 2.7, env: TOXENV=py27-1.11 }
+    - { python: 3.4, env: TOXENV=py34-1.11 }
+    - { python: 3.4, env: TOXENV=py34-2.0 }
+    - { python: 3.5, env: TOXENV=py35-1.11 }
+    - { python: 3.5, env: TOXENV=py35-2.0 }
+    - { python: 3.5, env: TOXENV=py35-2.1 }
+    - { python: 3.5, env: TOXENV=py35-master }
+    - { python: 3.6, env: TOXENV=py36-2.0 }
+    - { python: 3.6, env: TOXENV=py36-2.1 }
+    - { python: 3.6, env: TOXENV=py36-master }
+    - { python: 3.7-dev, env: TOXENV=py37-2.1 }
+    - { python: 3.7-dev, env: TOXENV=py37-master }
+    - { python: 3.6, env: TOXENV=docs }
+    - { python: 3.6, env: TOXENV=flake8 }
+    - { python: 3.6, env: TOXENV=isort }
+    - { python: 3.6, env: TOXENV=potypo }
+
+  # we allow failures for versions which are not yet released:
+  allow_failures:
+      - env: TOXENV=py35-master
+      - env: TOXENV=py36-master
+      - env: TOXENV=py37-master
+      - env: TOXENV=py37-2.1
+
 after_success:
     coveralls