diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml
index c37d22c2e..2f1d4fafb 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -25,7 +25,7 @@
 
   <target name="cleanup">
     <delete file="testlog.txt"/>
-    <delete dir="out" includeemptydirs="true" failonerror="false"/>
+    <delete dir="out"/>
   </target>
 
   <target name="testForkedOutput">
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java
index ac36af226..bdf7143f9 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java
@@ -37,6 +37,13 @@ public class JUnitTestListenerTest extends BuildFileTest {
         configureProject("src/etc/testcases/taskdefs/optional/junit.xml");
     }
 
+    /**
+     * The teardown method for JUnit.
+     */
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+
     public void testFullLogOutput() {
         executeTarget(PASS_TEST_TARGET);
         assertTrue("expecting full log to have BuildListener events",