diff --git a/cactus/plugin.jelly b/cactus/plugin.jelly
index 1ec6a719..ab1c2471 100644
--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@@ -230,10 +230,9 @@
             <ant:setProperty name="serverxml" value="${cactus.tomcat4x.config}"/>
           </j:if>        
           <j:if test="${context.getVariable('cactus.tomcat4x.conf.dir') != null}">
-            <conf dir="${cactus.tomcat4x.conf.dir}">
-              <ant:include name="${cactus.tomcat4x.conf.includes}"/>
-              <ant:exclude name="${cactus.tomcat4x.conf.excludes}"/>
-            </conf>
+            <conf dir="${cactus.tomcat4x.conf.dir}"
+              includes="${cactus.tomcat4x.conf.includes}"
+              excludes="${cactus.tomcat4x.conf.excludes}"/>
           </j:if>
         </tomcat4x>
 
@@ -245,10 +244,9 @@
             <ant:setProperty name="serverxml" value="${cactus.tomcat5x.config}"/>
           </j:if>        
           <j:if test="${context.getVariable('cactus.tomcat5x.conf.dir') != null}">
-            <conf dir="${cactus.tomcat5x.conf.dir}">
-              <ant:include name="${cactus.tomcat5x.conf.includes}"/>
-              <ant:exclude name="${cactus.tomcat5x.conf.excludes}"/>
-            </conf>
+            <conf dir="${cactus.tomcat5x.conf.dir}"
+              includes="${cactus.tomcat5x.conf.includes}"
+              excludes="${cactus.tomcat5x.conf.excludes}"/>
           </j:if>            
         </tomcat5x>
 
@@ -256,10 +254,9 @@
       <ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
       <ant:formatter type="xml"/>
       <ant:batchtest>
-        <ant:fileset dir="${cactus.src.dir}">
-          <ant:include name="${cactus.src.includes}"/>
-          <ant:exclude name="${cactus.src.excludes}"/>
-        </ant:fileset>
+        <ant:fileset dir="${cactus.src.dir}"
+          includes="${cactus.src.includes}"
+          excludes="${cactus.src.excludes}"/>
       </ant:batchtest>
     </cactus>