diff --git a/buildout.cfg b/buildout.cfg
index 0af9e5c..1a1972b 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -5,8 +5,7 @@ parts =
     supervisor
     test
     omelette
-    coverage-test
-    coverage-report
+    coverage
 
 develop = .
 
@@ -65,19 +64,15 @@ programs =
 
 
 [test]
-recipe = zc.recipe.testrunner
-eggs =
-    osiris[test]
-defaults = ['-v', '--auto-color', '--auto-progress', '-s', 'osiris']
-
-[coverage-test]
-recipe = zc.recipe.testrunner
+recipe = tranchitella.recipe.testrunner
 eggs = osiris[test]
-defaults = ['--coverage', '../../coverage', '-v', '--auto-progress']
+defaults = ['--auto-color', '--auto-progress']
+
+[coverage]
+recipe = tranchitella.recipe.testrunner
+eggs = ${test:eggs}
+defaults = ['--coverage-module', 'osiris', '--coverage-branch', '--auto-progress', '--coverage-html', '--coverage-xml']
 
-[coverage-report]
-recipe = zc.recipe.egg
-eggs = createzopecoverage
 
 [omelette]
 recipe = collective.recipe.omelette