diff --git a/build.xml b/build.xml
index ed3b3c236..ae786cd21 100644
--- a/build.xml
+++ b/build.xml
@@ -929,16 +929,6 @@
       </batchtest>
 
     </junit>
-
-    <!-- clean up again -->
-    <delete dir="${tests.etc.dir}/taskdefs/optional/antlr/antlr.tmp" />
-    <delete dir="${tests.etc.dir}/taskdefs/taskdefs.tmp" />
-    <delete dir="${tests.etc.dir}/taskdefs.tmp" />
-    <delete file="${tests.etc.dir}/taskdefs/tmp.jar" />
-    <delete dir="${tests.etc.dir}/types/copytest" />
-    <!-- generated by testcases in jvm dir -->
-    <delete file="${user.dir}/xalan1-redirect-out.tmp" />
-    <delete file="${user.dir}/xalan2-redirect-out.tmp" />
   </target>
 
   <target name="run-single-test" if="testcase" depends="compile-tests">
diff --git a/src/etc/testcases/taskdefs/copydir.xml b/src/etc/testcases/taskdefs/copydir.xml
index 10c5742f2..ef4669370 100644
--- a/src/etc/testcases/taskdefs/copydir.xml
+++ b/src/etc/testcases/taskdefs/copydir.xml
@@ -30,4 +30,8 @@
              dest="template.xml"/>
   </target>
 
+  <target name="cleanup">
+    <delete dir="../taskdefs.tmp" />
+  </target>
+
 </project>
diff --git a/src/etc/testcases/taskdefs/delete.xml b/src/etc/testcases/taskdefs/delete.xml
index ea10eee96..0d0c09b63 100644
--- a/src/etc/testcases/taskdefs/delete.xml
+++ b/src/etc/testcases/taskdefs/delete.xml
@@ -12,17 +12,14 @@
     <delete file="taskdefs.tmp"/>
   </target>
 
-  <target name="test3">
-    <copydir src="." 
-             dest="taskdefs.tmp"/>
-    <delete dir="taskdefs.tmp/ant.xml"/>
-  </target>
-
   <target name="test4">
     <copydir src="." 
              dest="taskdefs.tmp"/>
     <delete dir="taskdefs.tmp"/>
   </target>
 
+  <target name="cleanup">
+    <delete dir="taskdefs.tmp" />
+  </target>
 
 </project>
diff --git a/src/etc/testcases/taskdefs/filter.xml b/src/etc/testcases/taskdefs/filter.xml
index a41a843fc..f2ea3a6f8 100644
--- a/src/etc/testcases/taskdefs/filter.xml
+++ b/src/etc/testcases/taskdefs/filter.xml
@@ -42,4 +42,8 @@
     </copy>
   </target>
 
+  <target name="cleanup">
+    <delete dir="taskdefs.tmp" />
+  </target>
+
 </project>
diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index 81679a558..3bbfdf766 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -21,8 +21,6 @@
   </target>
 
   <target name="test4">
-   <!-- delete the tmp.jar or the next test will fail -->
-   <delete file="tmp.jar"/>
    <jar
     	destfile="tmp.jar"
 	basedir="."
@@ -39,4 +37,8 @@
     />
   </target>
 
+  <target name="cleanup">
+    <delete file="tmp.jar" />
+  </target>
+
 </project>
diff --git a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
index a2c398827..d4752ee07 100644
--- a/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
+++ b/src/etc/testcases/taskdefs/optional/antlr/antlr.xml
@@ -10,21 +10,15 @@
   </target>
 
   <target name="test2">
-    <!-- delete the tmp directory, it may exists if a previous ANTLR test
-         failed.  This in turn will cause this test to fail, as it tests
-         the build exception when the outputdirectory is invalid. -->
-    <deltree dir="${tmp.dir}"/>
     <antlr target="antlr.g" outputdirectory="${tmp.dir}"/>
   </target>
 
   <target name="test3">
-    <deltree dir="${tmp.dir}"/>
     <mkdir dir="${tmp.dir}"/>
     <antlr target="antlr.g" outputdirectory="${tmp.dir}"/>
   </target>
 
   <target name="test4">
-    <deltree dir="${tmp.dir}"/>
     <mkdir dir="${tmp.dir}"/>
     <antlr target="java.g" outputdirectory="${tmp.dir}"/>
     <antlr target="java.tree.g" outputdirectory="${tmp.dir}"/>
@@ -35,8 +29,6 @@
   </target>
 
   <target name="test6">
-    <deltree dir="${tmp.dir}"/>
-    <!-- This tmp.dir needs to be deleted by the build file which executes this test. -->
     <mkdir dir="${tmp.dir}"/>
     <antlr target="java.g" outputdirectory="${tmp.dir}" />
     <antlr dir="${tmp.dir}"
@@ -49,4 +41,8 @@
     <antlr target="antlr.xml"/>
   </target>    
 
+  <target name="cleanup">
+    <delete dir="${tmp.dir}" />
+  </target>
+
 </project>
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index ec48043d5..e508d043d 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -68,6 +68,7 @@
     <delete file="test6.zip"/>
     <delete file="inner7.zip"/>
     <delete file="test7.zip"/>
+    <delete file="test8.zip"/>
     <delete file="asf-logo.gif.zip"/>
   </target>
 </project>
diff --git a/src/etc/testcases/types/mapper.xml b/src/etc/testcases/types/mapper.xml
index e9a8eedf3..c42f9b92e 100644
--- a/src/etc/testcases/types/mapper.xml
+++ b/src/etc/testcases/types/mapper.xml
@@ -3,7 +3,6 @@
 <project name="copy-test" basedir="." default="test1">
 
   <target name="test1">
-    <delete dir="copytest" />
     <mkdir dir="copytest" />
     <copy todir="copytest">
       <fileset dir="../../../main">
@@ -16,4 +15,8 @@
     </copy>
   </target>
 
+  <target name="cleanup">
+    <delete dir="copytest" />
+  </target>
+
 </project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
index 2ffd533f3..d8c82832e 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
@@ -70,6 +70,10 @@ public class CopydirTest extends BuildFileTest {
         configureProject("src/etc/testcases/taskdefs/copydir.xml");
     }
     
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+    
     public void test1() { 
         expectBuildException("test1", "required argument not specified");
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
index bcad7371b..b95703e17 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
@@ -69,6 +69,10 @@ public class DeleteTest extends BuildFileTest {
         configureProject("src/etc/testcases/taskdefs/delete.xml");
     }
 
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+    
     public void test1() { 
         expectBuildException("test1", "required argument not specified");
     }
@@ -77,11 +81,6 @@ public class DeleteTest extends BuildFileTest {
         executeTarget("test2");
     }
 
-    // delete now handles files *and* directories --SB
-//    public void test3() { 
-//        expectBuildException("test3", "Not a directory");
-//    }
-
     public void test4() { 
         executeTarget("test4");
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
index b64438370..a39e9e496 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
@@ -74,6 +74,10 @@ public class FilterTest extends BuildFileTest {
         configureProject("src/etc/testcases/taskdefs/filter.xml");
     }
 
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+    
     public void test1() { 
         expectBuildException("test1", "required argument missing");
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
index 9350725bb..c1d3c8680 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -74,6 +74,10 @@ public class JarTest extends BuildFileTest {
         configureProject("src/etc/testcases/taskdefs/jar.xml");
     }
 
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+    
     public void test1() {
         expectBuildException("test1", "required argument not specified");
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
index 8fb763133..a28fb5de3 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
@@ -81,6 +81,10 @@ public class ANTLRTest extends BuildFileTest {
         configureProject(TASKDEFS_DIR + "antlr.xml");
     }
 
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+    
     public void test1() {
         expectBuildException("test1", "required argument, target, missing");
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
index b1c4f8618..eeaec9874 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
@@ -69,6 +69,13 @@ public class TraXLiaisonTest extends AbstractXSLTLiaisonTest {
         super(name);
     }
 
+    public void tearDown() {
+        File f = new File("xalan2-redirect-out.tmp");
+        if (f.exists()) {
+            f.delete();
+        }
+    }
+
     public XSLTLiaison createLiaison() throws Exception {
         return new TraXLiaison();
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java
index 4aa4c13af..873390175 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java
@@ -68,6 +68,13 @@ public class XalanLiaisonTest extends AbstractXSLTLiaisonTest {
         super(name);
     }
 
+    public void tearDown() {
+        File f = new File("xalan1-redirect-out.tmp");
+        if (f.exists()) {
+            f.delete();
+        }
+    }
+
     protected XSLTLiaison createLiaison() throws Exception {
         return new XalanLiaison();
     }
diff --git a/src/testcases/org/apache/tools/ant/types/MapperTest.java b/src/testcases/org/apache/tools/ant/types/MapperTest.java
index 896bbe2b6..2cc15ac0d 100644
--- a/src/testcases/org/apache/tools/ant/types/MapperTest.java
+++ b/src/testcases/org/apache/tools/ant/types/MapperTest.java
@@ -178,8 +178,12 @@ public class MapperTest extends TestCase {
 
     public void testCopyTaskWithTwoFilesets() {
         TaskdefForCopyTest t = new TaskdefForCopyTest("test1");
-        t.setUp();
-        t.test1();
+        try {
+            t.setUp();
+            t.test1();
+        } finally {
+            t.tearDown();
+        }
     }
 
     private class TaskdefForCopyTest extends BuildFileTest {
@@ -191,6 +195,10 @@ public class MapperTest extends TestCase {
             configureProject("src/etc/testcases/types/mapper.xml");
         }
 
+        public void tearDown() {
+            executeTarget("cleanup");
+        }
+
         public void test1() { 
             executeTarget("test1");
         }