diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 34f2fcff..47b917eb 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -83,10 +83,24 @@
     <j:set var="maven.junit.fork" scope="parent" value="true"/>
 
     <echo>Setting Clover compiler</echo>
+    <ant:property name="compileSrcSetString" refid="maven.compile.src.set"/>
+    <ant:property name="compileTestSetString" refid="maven.test.compile.src.set"/>
+
     <ant:clover-setup 
-      initstring="${cloverDatabase}"
-      flushpolicy="interval"
-      flushinterval="500"/>
+        initstring="${cloverDatabase}"
+        flushpolicy="interval"
+        flushinterval="500">
+
+      <!-- TODO: Support several paths in compileSrcSetString and compileTestSetString --> 
+      <ant:fileset dir="${compileSrcSetString}">
+        <ant:include name="**/*.java"/>
+      </ant:fileset>
+      <j:if test="${context.getVariable('maven.clover.instrument.tests') == 'true'}">
+        <ant:fileset dir="${compileTestSetString}">
+          <ant:include name="**/*.java"/>
+        </ant:fileset>
+      </j:if>
+    </ant:clover-setup>
     <echo>Now using primary build.compiler : ${build.compiler}</echo>
 
     <j:set var="tmp" value="${maven.build.clover.classes}"/>
diff --git a/clover/plugin.properties b/clover/plugin.properties
index 690a3e3b..9fa4c69b 100644
--- a/clover/plugin.properties
+++ b/clover/plugin.properties
@@ -10,6 +10,9 @@ maven.build.clover.classes = ${maven.build.clover}/classes
 maven.clover.database.dir = ${maven.build.clover}/database
 maven.clover.orderBy=PcCoveredAsc
 
+# Whether tests should be instrumented by Clover or not
+maven.clover.instrument.tests = false
+
 # What are the reports that should be generated
 maven.clover.report.html=true
 maven.clover.report.xml=false
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index db8d3503..f6c52561 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -9,6 +9,11 @@
   <body>
 
 	<release version="1.4" date="in CVS">
+	  <action dev="vmassol" type="add">
+        Conditionally instrument test classes too. To instrument test classes
+        set the <code>maven.clover.instrument.tests</code> to 
+        <code>true</code>.
+	  </action>
 	  <action dev="vmassol" type="update">
 	    Make sure that the clover plugin restore other plugin's
 	    properties it has modified.
diff --git a/clover/xdocs/properties.xml b/clover/xdocs/properties.xml
index fda0dd33..cbbd532c 100644
--- a/clover/xdocs/properties.xml
+++ b/clover/xdocs/properties.xml
@@ -27,6 +27,16 @@
             <code>PcCoveredAsc</code>
           </td>
         </tr>
+        <tr>
+          <td>maven.clover.instrument.tests</td>
+          <td>Yes</td>
+          <td>
+            Decides whether to instrument test classes.
+          </td>
+          <td>
+            <code>false</code>
+          </td>
+        </tr>
         <tr>
           <td>maven.clover.report.html</td>
           <td>Yes</td>