diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 65706ec8..656ea0d1 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -184,9 +184,17 @@
   -->
   <goal name="clover:test">
 
-    <attainGoal name="clover:on"/>
-    <attainGoal name="test:test"/>
-    <attainGoal name="clover:off"/>
+    <!-- Only run clover if there are tests to execute -->
+    <j:choose>
+      <j:when test="${unitTestSourcesPresent == 'true'}">
+        <attainGoal name="clover:on"/>
+        <attainGoal name="test:test"/>
+        <attainGoal name="clover:off"/>
+      </j:when>
+      <j:otherwise>
+        <ant:echo>No tests to run Clover on</ant:echo>
+      </j:otherwise>
+    </j:choose>
 
   </goal>
 
@@ -196,26 +204,37 @@
        be generated.
      ========================================================================
   -->
-  <goal name="clover:report" prereqs="clover:test">
+  <goal name="clover:report">
 
-    <!-- Skip reports if no coverage database has been created. -->
-    <u:file var="cloverDatabaseAsFile" name="${cloverDatabase}"/>
     <j:choose>
-      <j:when test="${cloverDatabaseAsFile.exists()}">       
+      <j:when test="${unitTestSourcesPresent == 'true'}">
 
-        <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>
+        <attainGoal name="clover:test"/>
         
+        <!-- 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 Clover database found, skipping report generation</ant:echo>
+        <ant:echo>No tests to run Clover on</ant:echo>
       </j:otherwise>
     </j:choose>
 
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index 546c059c..4a7f7674 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -28,6 +29,10 @@
   <body>
 
     <release version="1.5" date="in CVS">
+	    <action dev="vmassol" type="fix">
+	      Do not execute Clover if there are no tests to run Clover on. This
+	      prevents an error happening in the <code>clover:on</code> goal.
+	    </action>
 	    <action dev="vmassol" type="update">
 	      Allow generating XML and/or Swing reports during the web site generation 
 	      too.
