diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 007f8dab..5f3dc02b 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -90,7 +90,7 @@
   -->
   <goal name="clover"
         description="Generate test coverage reports with Clover"
-        prereqs="clover:report"/>
+        prereqs="clover:test,clover:report"/>
  
   <!--
      ========================================================================
@@ -207,37 +207,26 @@
        be generated.
      ========================================================================
   -->
-  <goal name="clover:report">
+  <goal name="clover:report" prereqs="clover:on">
 
+    <!-- Skip reports if no coverage database has been created. -->
+    <u:file var="cloverDatabaseAsFile" name="${cloverDatabase}"/>
     <j:choose>
-      <j:when test="${unitTestSourcesPresent == 'true'}">
+      <j:when test="${cloverDatabaseAsFile.exists()}">       
 
-        <attainGoal name="clover:test"/>
+        <j:if test="${context.getVariable('maven.clover.report.xml') == 'true'}">
+          <attainGoal name="clover:xml-report-internal"/>
+        </j:if>
+        <j:if test="${context.getVariable('maven.clover.report.html') == 'true'}">
+          <attainGoal name="clover:html-report-internal"/>
+        </j:if>
+        <j:if test="${context.getVariable('maven.clover.report.swing') == 'true'}">
+          <attainGoal name="clover:swing-report-internal"/>
+        </j:if>
         
-        <!-- Skip reports if no coverage database has been created. -->
-        <u:file var="cloverDatabaseAsFile" name="${cloverDatabase}"/>
-        <j:choose>
-          <j:when test="${cloverDatabaseAsFile.exists()}">       
-
-            <j:if test="${context.getVariable('maven.clover.report.xml') == 'true'}">
-              <attainGoal name="clover:xml-report-internal"/>
-            </j:if>
-            <j:if test="${context.getVariable('maven.clover.report.html') == 'true'}">
-              <attainGoal name="clover:html-report-internal"/>
-            </j:if>
-            <j:if test="${context.getVariable('maven.clover.report.swing') == 'true'}">
-              <attainGoal name="clover:swing-report-internal"/>
-            </j:if>
-        
-          </j:when>
-          <j:otherwise>
-            <ant:echo>No Clover database found, skipping report generation</ant:echo>
-          </j:otherwise>
-        </j:choose>
-
       </j:when>
       <j:otherwise>
-        <ant:echo>No tests to run Clover on</ant:echo>
+        <ant:echo>No Clover database found, skipping report generation</ant:echo>
       </j:otherwise>
     </j:choose>
 
@@ -333,7 +322,7 @@
      ========================================================================
   -->
   <goal name="maven-clover-plugin:report">
-    <attainGoal name="clover:report"/>
+    <attainGoal name="clover"/>
   </goal>
 
 </project>
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index 81e18d12..b0e9c1fb 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -26,6 +26,10 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="update">
+        The <code>clover:report</code> goal does not call the tests anymore. 
+        It only generates Clover reports.
+      </action>
       <action dev="vmassol" type="fix">
         When executing <code>clover:on</code> and <code>clover:off</code>, modify 
         the <code>maven.build.dest</code> property value in the Root context of