diff --git a/src/etc/testcases/core/extended-taskdef.xml b/src/etc/testcases/core/extended-taskdef.xml
index 66bb14e1d..805368fd9 100644
--- a/src/etc/testcases/core/extended-taskdef.xml
+++ b/src/etc/testcases/core/extended-taskdef.xml
@@ -5,6 +5,7 @@
 
   </description>
   <property name="src" value="Foo.java"/>
+  <property name="taskdefs" value="tasks.properties"/>
 
   <target name="write" >
     <echo file="${src}">
@@ -17,6 +18,9 @@
         }
       }
     </echo>
+    <propertyfile file="${taskdefs}">
+      <entry key="foo2" value="Foo"/>
+    </propertyfile>
   </target>
 
   <target name="compile" depends="write">
@@ -32,11 +36,21 @@
     </foo>
   </target>
 
+  <target name="testRun2" depends="compile">
+    <taskdef resource="${taskdefs}" classpath="${basedir}"/>
+    <foo2 maxwait="5" maxwaitunit="second"
+        timeoutproperty="foo">
+      <or/>
+    </foo2>
+  </target>
+
+
   <target name="teardown">
     <delete>
       <fileset dir="${basedir}"
           includes="${src},*.class"/>
     </delete>
+    <delete file="${taskdefs}" />
   </target>
 
 </project>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/ExtendedTaskdefTest.java b/src/testcases/org/apache/tools/ant/ExtendedTaskdefTest.java
index 31e8a0c55..d1f00eaf6 100644
--- a/src/testcases/org/apache/tools/ant/ExtendedTaskdefTest.java
+++ b/src/testcases/org/apache/tools/ant/ExtendedTaskdefTest.java
@@ -35,9 +35,30 @@ public class ExtendedTaskdefTest extends BuildFileTest {
         configureProject("src/etc/testcases/core/extended-taskdef.xml");
     }
 
+    /**
+     * Automatically calls the target called "tearDown"
+     * from the build file tested if it exits.
+     * <p/>
+     * This allows to use Ant tasks directly in the build file
+     * to clean up after each test. Note that no "setUp" target
+     * is automatically called, since it's trivial to have a
+     * test target depend on it.
+     */
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        executeTarget("teardown");
+    }
+
     public void testRun() throws Exception {
         expectBuildExceptionContaining("testRun",
                 "exception thrown by the subclass",
                 "executing the Foo task");
     }
+
+    public void testRun2() throws Exception {
+        expectBuildExceptionContaining("testRun2",
+                "exception thrown by the subclass",
+                "executing the Foo task");
+    }
+
 }