diff --git a/.travis.yml b/.travis.yml
index 900853cf7..f05d6a3b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,17 @@ matrix:
     - python: 'pypy'
       env: TOXENV=pypy
     - python: '2.7'
-      env: TOXENV=du13
+      env:
+        - TOXENV=du13
+        - PYTEST_ADDOPTS = --cov sphinx --cov-append --cov-config setup.cfg
     - python: '3.4'
       env: TOXENV=py34
     - python: '3.5'
       env: TOXENV=py35
     - python: '3.6'
-      env: TOXENV=py36
+      env:
+        - TOXENV=py36
+        - PYTEST_ADDOPTS = --cov sphinx --cov-append --cov-config setup.cfg
     - python: 'nightly'
       env: TOXENV=py37
     - python: '3.6'
@@ -35,7 +39,10 @@ addons:
       - imagemagick
 
 install:
-  - pip install -U tox
+  - pip install -U tox codecov
 
 script:
   - tox -- -v
+
+after_success:
+  - codecov
diff --git a/README.rst b/README.rst
index 6419503e4..2d841f78e 100644
--- a/README.rst
+++ b/README.rst
@@ -22,6 +22,10 @@
    :target: https://circleci.com/gh/sphinx-doc/sphinx
    :alt: Build Status (CircleCI)
 
+.. image:: https://codecov.io/gh/sphinx-doc/sphinx/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/sphinx-doc/sphinx
+   :alt: Code Coverage Status (Codecov)
+
 Sphinx is a tool that makes it easy to create intelligent and beautiful
 documentation for Python projects (or other documents consisting of multiple
 reStructuredText sources), written by Georg Brandl.  It was originally created
diff --git a/setup.cfg b/setup.cfg
index 00e7833d3..0ce6282dc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,3 +43,17 @@ follow_imports = skip
 incremental = True
 check_untyped_defs = True
 warn_unused_ignores = True
+
+[coverage:run]
+branch = True
+source = sphinx
+
+[coverage:report]
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+    # Don't complain if tests don't hit defensive assertion code:
+    raise NotImplementedError
+    # Don't complain if non-runnable code isn't run:
+    if __name__ == .__main__.:
+ignore_errors = True
diff --git a/tox.ini b/tox.ini
index 4b462d612..5ff3e9f33 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ deps =
     du14: docutils==0.14
 setenv =
     SPHINX_TEST_TEMPDIR = {envdir}/testbuild
-    coverage: PYTEST_ADDOPTS = --cov sphinx
+    coverage: PYTEST_ADDOPTS = --cov sphinx --cov-config {toxinidir}/setup.cfg
 commands=
     {envpython} -Wall tests/run.py --durations 25 {posargs}