diff --git a/.travis.yml b/.travis.yml
index 73891679e..a28f8eaed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,26 +5,24 @@ language: python
 matrix:
   include:
     - python: 2.7
-      env: TOXENV=py27
+      env: TOXENV=py27-cov
     - python: 3.4
-      env: TOXENV=py34
+      env: TOXENV=py34-cov
     - python: 3.5
       env:
-        - TOXENV=py35
+        - TOXENV=py35-cov
         - BUILD_DIST=true
     - python: 3.6
-      env: TOXENV=py36
+      env: TOXENV=py36-cov
     - python: pypy
-      env: TOXENV=pypy
+      # disable coverage.py on pypy because of performance problems
+      env: TOXENV=pypy-nocov
     - language: generic
       os: osx
-      env: TOXENV=py27
+      env: TOXENV=py27-cov
     - language: generic
       os: osx
-      env: TOXENV=py35
-    # coveralls is not listed in tox's envlist, but should run in travis
-    - python: 3.5
-      env: TOXENV=coveralls
+      env: TOXENV=py35-cov
 
 install:
   - ./.travis/install.sh
@@ -32,6 +30,9 @@ install:
 script:
   - ./.travis/run.sh
 
+after_success:
+  - ./.travis/after_success.sh
+
 before_deploy:
   - ./.travis/before_deploy.sh