diff --git a/test-plone-4.0.x.cfg b/test-plone-4.0.x.cfg
index 709e243..a0c4608 100644
--- a/test-plone-4.0.x.cfg
+++ b/test-plone-4.0.x.cfg
@@ -10,8 +10,9 @@ parts +=
     test
     pycoverage
     coverage
-    report
-    htmlreport
+    coverage-plain    
+    coverage-xml
+    coverage-html
     jscoverage-build
     jscoverage
     pylint
@@ -45,26 +46,31 @@ eggs = coverage
 initialization =
     sys.argv = sys.argv[:] + ['run', 'bin/test', '-k', '-q', '--xml']
 
-[report]
+[coverage-plain]
 recipe = zc.recipe.egg
 eggs = coverage
-scripts = coverage=report
+scripts = coverage=coverage-plain
 initialization =
-    eggs = '${buildout:eggs-directory}'
-    bin = '${buildout:directory}/bin'
-    exclude = '--omit=' + 'plone/app/discussion/tests/*'
-    include = '--include=' + 'plone/app/discussion/*.py'
+    exclude = '--omit=' + '${buildout:package-directory}/tests/*'
+    include = '--include=' + '${buildout:package-directory}/*.py'
+    sys.argv = sys.argv[:] + ['report', '-i', include, exclude]
+
+[coverage-xml]
+recipe = zc.recipe.egg
+eggs = coverage
+scripts = coverage=coverage-xml
+initialization =
+    exclude = '--omit=' + '${buildout:package-directory}/tests/*'
+    include = '--include=' + '${buildout:package-directory}/*.py'
     sys.argv = sys.argv[:] + ['xml', '-i', include, exclude]
 
-[htmlreport]
+[coverage-html]
 recipe = zc.recipe.egg
 eggs = coverage
-scripts = coverage=htmlreport
+scripts = coverage=coverage-html
 initialization =
-    eggs = '${buildout:eggs-directory}'
-    bin = '${buildout:directory}/bin'
-    exclude = '--omit=' + 'plone/app/discussion/tests/*'
-    include = '--include=' + 'plone/app/discussion/*.py'
+    exclude = '--omit=' + '${buildout:package-directory}/tests/*'
+    include = '--include=' + '${buildout:package-directory}/*.py'
     sys.argv = sys.argv[:] + ['html', '-i', include, exclude]
     
 [jscoverage-build]