diff --git a/.travis.yml b/.travis.yml
index 1c865fb9e..69c7ab309 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,29 @@
 language: python
 # command to install dependencies
-install: "pip install -U detox"
+install: "pip install -U tox"
 # # command to run tests
-script: detox --recreate -i ALL=https://devpi.net/hpk/dev/
+env:
+  matrix:
+    - TESTENV=flakes
+    - TESTENV=py26
+    - TESTENV=py27
+    - TESTENV=py34
+    - TESTENV=pypy
+    - TESTENV=py27-pexpect
+    - TESTENV=py33-pexpect
+    - TESTENV=py27-nobyte
+    - TESTENV=py33
+    - TESTENV=py27-xdist
+    - TESTENV=py33-xdist
+    - TESTENV=py27
+    - TESTENV=py27-trial
+    - TESTENV=py33
+    - TESTENV=py33-trial
+    - TESTENV=py27-subprocess
+    - TESTENV=doctesting
+    - TESTENV=py27-cxfreeze
+    - TESTENV=coveralls
+script: tox --recreate -i ALL=https://devpi.net/hpk/dev/ -e $TESTENV
 
 notifications:
   irc:
diff --git a/README.rst b/README.rst
index 1664bddde..6d2566d02 100644
--- a/README.rst
+++ b/README.rst
@@ -5,6 +5,8 @@ pytest
 The ``pytest`` testing tool makes it easy to write small tests, yet
 scales to support complex functional testing.
 
+.. image:: https://coveralls.io/repos/pytest-dev/pytest/badge.png?branch=master
+   :target: https://coveralls.io/r/pytest-dev/pytest
 .. image:: https://pypip.in/v/pytest/badge.png
    :target: https://pypi.python.org/pypi/pytest
 
diff --git a/tox.ini b/tox.ini
index 1b7822e3a..7f083a709 100644
--- a/tox.ini
+++ b/tox.ini
@@ -141,6 +141,18 @@ commands=
     {envpython} runtests_setup.py build --build-exe build
     {envpython} tox_run.py
 
+[testenv:coveralls]
+changedir=testing
+basepython=python3.4
+deps =
+    {[testenv]deps}
+    coveralls
+commands=
+    coverage run --source=_pytest {envdir}/bin/py.test
+    coverage report -m
+    coveralls
+passenv=COVERALLS_REPO_TOKEN
+
 [pytest]
 minversion=2.0
 plugins=pytester