diff --git a/src/etc/testcases/taskdefs/delete.xml b/src/etc/testcases/taskdefs/delete.xml
index 733997f8f..f5da51615 100644
--- a/src/etc/testcases/taskdefs/delete.xml
+++ b/src/etc/testcases/taskdefs/delete.xml
@@ -21,7 +21,7 @@
         <condition>
           <or>
             <resourcecount when="greater" count="0">
-              <fileset refid="fs" />
+              <fileset dir="${dir}" />
             </resourcecount>
             <not>
               <resourcecount count="${srcdirs}">
diff --git a/src/etc/testcases/taskdefs/exec/apply.xml b/src/etc/testcases/taskdefs/exec/apply.xml
index c67cad683..8e217372a 100755
--- a/src/etc/testcases/taskdefs/exec/apply.xml
+++ b/src/etc/testcases/taskdefs/exec/apply.xml
@@ -460,7 +460,7 @@
       </apply>
     </target>
 
-    <target name="cleanup">
+    <target name="cleanup" depends="xyz">
         <delete>
             <fileset refid="xyz" />
             <fileset dir="${basedir}" includes="redirect.*" />