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..8c29ecb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
     - TOXENV=py32
     - TOXENV=py33
 install:
-    - pip install --quiet --use-mirrors tox
+    - pip install --quiet --use-mirrors tox coveralls
 script:
     - tox
+    - if [ $TOXENV == "py33" ]; then coveralls; fi
diff --git a/tox.ini b/tox.ini
index 8fa50614..c6bf7e98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist = py25, py26, py27, py32, py33
 deps =
     pytest
 commands =
-    py.test []
+    py.test jedi
 [testenv:py25]
 deps =
     simplejson
@@ -14,3 +14,8 @@ deps =
 deps =
     unittest2
     {[testenv]deps}
+[testenv:py33]
+deps =
+    pytest-cov
+commands =
+    py.test --cov jedi