diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..bbbd7b2
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,9 @@
+[report]
+omit =
+    /home/*/.buildout/eggs/*
+    /usr/*
+    bin/test
+    /home/travis/buildout-cache/eggs/*
+    /home/travis/virtualenv/*
+    eggs/*
+    parts/*
diff --git a/.travis.yml b/.travis.yml
index 337895e..6e07387 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,32 @@
 language: python
-python: '2.7'
+python: 2.7
 sudo: false
+env:
+  - PLONE_VERSION=4.x
+  - PLONE_VERSION=5.x
 cache:
+  pip: true
   directories:
-  - eggs
+    - $HOME/buildout-cache
+matrix:
+  fast_finish: true
+before_install:
+  - mkdir -p $HOME/buildout-cache/{eggs,downloads}
+  - mkdir $HOME/.buildout
+  - echo "[buildout]" > $HOME/.buildout/default.cfg
+  - echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
+  - echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
+  - pip install zc.buildout
+  - cp test-$PLONE_VERSION.cfg buildout.cfg
 install:
-- python bootstrap.py -v 1.7.1 -c test-$PLONE_VERSION.cfg
-- bin/buildout -N -t 3 -c test-$PLONE_VERSION.cfg annotate
-- bin/buildout -N -t 3 -c test-$PLONE_VERSION.cfg
+  - buildout -N -t 3 annotate
+  - buildout -N -t 3
 script:
-- bin/test
-env:
-  matrix:
-    - PLONE_VERSION=4.x
-    - PLONE_VERSION=5.x
+  - bin/code-analysis
+  - bin/test
+after_success:
+  - bin/createcoverage
+  - pip install -q coveralls
+  - coveralls
+notifications:
+  irc: irc.freenode.org#plone-testing
diff --git a/CHANGES.rst b/CHANGES.rst
index 6809f1c..af14acf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,9 @@ Changelog
 - Fix code analysis errors.
   [gforcada]
 
+- Update testing infrastructure.
+  [gforcada]
+
 1.0 (2016-03-28)
 ----------------
 
diff --git a/README.rst b/README.rst
index 08254ff..7486e3d 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,14 @@
 Introduction
 ============
 
+.. image:: https://secure.travis-ci.org/plone/plone.app.drafts.png?branch=master
+    :alt: Travis CI badge
+    :target: http://travis-ci.org/plone/plone.app.drafts
+
+.. image:: https://coveralls.io/repos/plone/plone.app.drafts/badge.png?branch=master
+    :alt: Coveralls badge
+    :target: https://coveralls.io/r/plone/plone.app.drafts
+
 plone.app.drafts implements services for managing auto-saved content drafts in Plone.
 This addresses two problems:
 
@@ -13,10 +21,6 @@ This addresses two problems:
 The former problem pertains to any content add or edit form.
 The latter applies in particular to the "tiles" model as implemented by `plone.app.tiles`_ and its dependencies.
 
-..  image:: https://secure.travis-ci.org/plone/plone.app.drafts.png
-    :target: http://travis-ci.org/plone/plone.app.drafts
-
-
 Installation
 ============
 
diff --git a/test-4.x.cfg b/test-4.x.cfg
index 8be44e0..f7b8936 100644
--- a/test-4.x.cfg
+++ b/test-4.x.cfg
@@ -1,8 +1,21 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg
-    https://raw.githubusercontent.com/plone/plone.app.robotframework/master/versions.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
 
 package-name = plone.app.drafts
 package-extras = [test]
-versions = versions
+
+show-picked-versions = true
+
+parts +=
+    createcoverage
+
+[code-analysis]
+directory = plone
+flake8-ignore = E501,C901
+
+[versions]
+setuptools =
+coverage = >=3.7
+plone.tiles =
diff --git a/test-5.x.cfg b/test-5.x.cfg
index 81add12..32f4257 100644
--- a/test-5.x.cfg
+++ b/test-5.x.cfg
@@ -1,11 +1,21 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg
-    https://raw.githubusercontent.com/plone/plone.app.robotframework/master/versions.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-5.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
 
 package-name = plone.app.drafts
 package-extras = [test]
-versions = versions
+
+show-picked-versions = true
+
+parts +=
+    createcoverage
+
+[code-analysis]
+directory = plone
+flake8-ignore = E501,C901
 
 [versions]
-zc.buildout = 1.7.1
+setuptools =
+coverage = >=3.7
+plone.tiles =