diff --git a/.gitignore b/.gitignore
index ad9b77e4..4755f455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 *~
 *.swp
 *.swo
+*.pyc
 .ropeproject
 .tox
-*.pyc
+.coveralls.yml
+.coverage
 /build/
 /docs/_build/
 /dist/
diff --git a/.travis.yml b/.travis.yml
index a85a4d06..51d30e2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,16 @@ env:
     - TOXENV=py27
     - TOXENV=py32
     - TOXENV=py33
+    - TOXENV=cov
+matrix:
+    allow_failures:
+        - env: TOXENV=cov
 install:
     - pip install --quiet --use-mirrors tox
 script:
     - tox
+after_script:
+    - if [ $TOXENV == "cov" ]; then
+      pip install --quiet --use-mirrors coveralls
+      coveralls;
+      fi
diff --git a/tox.ini b/tox.ini
index 8fa50614..205c8594 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,3 +14,9 @@ deps =
 deps =
     unittest2
     {[testenv]deps}
+[testenv:cov]
+deps =
+    pytest-cov
+    {[testenv]deps}
+commands =
+    py.test --cov jedi []