diff --git a/test-plone-4.0.x.cfg b/test-plone-4.0.x.cfg
index 6f9c689..817887f 100644
--- a/test-plone-4.0.x.cfg
+++ b/test-plone-4.0.x.cfg
@@ -8,8 +8,9 @@ package-directory = plone/app/discussion
 parts +=
     omelette
     test
+    pycoverage
     coverage
-    coverage-report
+    report
     jscoverage-build
     jscoverage
     pylint
@@ -32,22 +33,27 @@ recipe = collective.xmltestreport
 eggs = ${buildout:package-name}
 defaults = ['--auto-color', '--auto-progress']
 
+[pycoverage]
+recipe = zc.recipe.egg
+eggs = coverage
+scripts = coverage=pycoverage
+
 [coverage]
 recipe = zc.recipe.egg
 eggs = coverage
 initialization =
     sys.argv = sys.argv[:] + ['run', 'bin/test', '-k', '-q', '--xml']
 
-[coverage-report]
+[report]
 recipe = zc.recipe.egg
 eggs = coverage
 scripts = coverage=report
 initialization =
     eggs = '${buildout:eggs-directory}'
     bin = '${buildout:directory}/bin'
-    tests = '${buildout:directory}/${buildout:package-directory}/tests'
-    exclude = '--omit=' + ','.join([eggs, sys.prefix, bin, tests])
-    sys.argv = sys.argv[:] + ['xml', '-i', exclude]
+    exclude = '--omit=' + 'plone/app/discussion/tests'
+    include = '--include=' + 'plone/app/discussion/*.py'
+    sys.argv = sys.argv[:] + ['xml', '-i', include, exclude]
 
 [jscoverage-build]
 recipe = zc.recipe.cmmi