diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..a405651
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,6 @@
+[run]
+branch = True
+source = DocumentTemplate
+
+[report]
+precision = 3
diff --git a/.gitignore b/.gitignore
index 61abd0c..e16d56a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,14 +3,17 @@ build
 coverage
 develop
 dist
+htmlcov
 lib
 parts
 
+*.egg-info/
 *.pyc
 *.pyo
+.coverage
 .installed.cfg
 .mr.developer.cfg
 .tox
 develop-eggs/
 eggs/
-*.egg-info/
+coverage.xml
diff --git a/.travis.yml b/.travis.yml
index 50ec5fe..f3e6e35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,15 @@ python:
     - 3.5
     - 3.6
 install:
-    - pip install -U setuptools==33.1.1
+    - pip install -U setuptools==33.1.1 coveralls coverage
     - pip install zc.buildout
     - buildout bootstrap
     - buildout
 script:
-    - bin/test -v1
+    - coverage run bin/test -v1
+after_success:
+    - coverage combine
+    - coveralls
 notifications:
     email: false
 cache:
diff --git a/tox.ini b/tox.ini
index 656165d..98c6567 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,32 @@
 [tox]
 envlist =
-   py27,py34,py35,py36
+   py27,
+   py34,
+   py35,
+   py36
+   coverage-report,
 
 [testenv]
+usedevelop = True
 install_command = pip install --no-cache-dir --no-binary=:all: {opts} {packages}
 commands =
-    zope-testrunner --test-path={envsitepackagesdir} -s DocumentTemplate -s TreeDisplay
+    coverage run {envbindir}/zope-testrunner --path=src --all {posargs:-vc} -s DocumentTemplate -s TreeDisplay
 deps =
     zope.testrunner
+    coverage
 setenv =
     PIP_NO_CACHE = 1
+    COVERAGE_FILE=.coverage.{envname}
+
+[testenv:coverage-report]
+basepython = python2.7
+deps = coverage
+setenv =
+    COVERAGE_FILE=.coverage
+skip_install = true
+commands =
+    coverage erase
+    coverage combine
+    coverage html
+    coverage xml
+    coverage report