diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml
index ec875c1cc..f01973b69 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -100,7 +100,7 @@
       <formatter type="xml"/>
       <classpath refid="test"/>
       <batchtest todir="out">
-        <fileset dir="../../../../testcases">
+        <fileset dir="../../../../tests/junit">
           <include
             name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
           <exclude name="**/JUnitTaskTest.java"/>
@@ -117,7 +117,7 @@
       <formatter type="xml" extension=".foo"/>
       <classpath refid="test"/>
       <batchtest todir="out">
-        <fileset dir="../../../../testcases">
+        <fileset dir="../../../../tests/junit">
           <include
             name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
           <exclude name="**/JUnitTaskTest.java"/>
@@ -134,7 +134,7 @@
         classname="org.apache.tools.ant.taskdefs.optional.junit.TestFormatter"/>
       <classpath refid="test"/>
       <batchtest todir="out">
-        <fileset dir="../../../../testcases">
+        <fileset dir="../../../../tests/junit">
           <include
             name="org/apache/tools/ant/taskdefs/optional/junit/*Test.java"/>
           <exclude name="**/JUnitTaskTest.java"/>
diff --git a/src/etc/testcases/types/mapper.xml b/src/etc/testcases/types/mapper.xml
index c42f9b92e..eba22da76 100644
--- a/src/etc/testcases/types/mapper.xml
+++ b/src/etc/testcases/types/mapper.xml
@@ -8,7 +8,7 @@
       <fileset dir="../../../main">
         <include name="**/taskdefs/*.java" />
       </fileset>
-      <fileset dir="../../../testcases">
+      <fileset dir="../../../tests/junit">
         <include name="**/taskdefs/*.java" />
       </fileset>
       <mapper type="flatten" />