diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 775c6cae..be9bdac4 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -127,9 +127,6 @@
     <ant:pathconvert property="compileSrcSetString" pathSep="||||" 
         refid="maven.compile.src.set"/>
     <u:tokenize var="srcDirs" delim="||||">${compileSrcSetString}</u:tokenize>
-    <ant:pathconvert property="testSrcSetString" pathSep="||||" 
-        refid="maven.test.compile.src.set"/>
-    <u:tokenize var="testDirs" delim="||||">${testSrcSetString}</u:tokenize>
 
     <ant:clover-setup 
         initstring="${cloverDatabase}"
@@ -144,6 +141,11 @@
 
       <!-- Conditionally instrument test code -->
       <j:if test="${context.getVariable('maven.clover.instrument.tests') == 'true'}">
+
+        <ant:pathconvert property="testSrcSetString" pathSep="||||" 
+            refid="maven.test.compile.src.set"/>
+        <u:tokenize var="testDirs" delim="||||">${testSrcSetString}</u:tokenize>
+
         <j:forEach var="testDir" items="${testDirs}">
           <ant:fileset dir="${testDir}">
             <ant:include name="**/*.java"/>
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index 5fc959c6..c7251d24 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="fix">
+        Prevented the <code>clover:on</code> goal from failing when there are 
+        no unit tests sources available.
+      </action>
       <action dev="vmassol" type="update">
         Updated to Clover Ant 1.3_01.
       </action>
