diff --git a/src/etc/testcases/types/filterset.xml b/src/etc/testcases/types/filterset.xml
index 9980c9918..12b272c6b 100644
--- a/src/etc/testcases/types/filterset.xml
+++ b/src/etc/testcases/types/filterset.xml
@@ -14,7 +14,6 @@
     <copy file="filterseta.txt" tofile="dest1.txt">
         <filterset refid="testset.one"/> 
     </copy>
-    <fixcrlf eol="lf" srcdir="." includes="dest1.txt"/>
   </target>
 
   <target name="test2">
@@ -22,7 +21,6 @@
     <copy file="filtersetb.txt" tofile="dest2.txt">
         <filterset refid="testset.two"/> 
     </copy>
-    <fixcrlf eol="lf" srcdir="." includes="dest2.txt"/>
   </target>
 
   <target name="test3">
@@ -31,7 +29,6 @@
         <filterset refid="testset.one"/> 
         <filterset refid="testset.two"/> 
     </copy>
-    <fixcrlf eol="lf" srcdir="." includes="dest3.txt"/>
   </target>
   
   <target name="cleanup">
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
index e9b6fc2dd..b8bbdbd13 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
@@ -68,15 +68,12 @@ import org.apache.tools.ant.BuildListener;
  */
 public class AntTest extends TaskdefsTest { 
     
-    private static final String TESTCASES_DIR = "src/etc/testcases";
-    private static final String TASKDEFS_DIR = TESTCASES_DIR + "/taskdefs";
-
     public AntTest(String name) { 
         super(name);
     }    
     
     public void setUp() { 
-        configureProject(TASKDEFS_DIR + "/ant.xml");
+        configureProject("src/etc/testcases/taskdefs/ant.xml");
     }
     
     public void test1() { 
@@ -107,7 +104,7 @@ public class AntTest extends TaskdefsTest {
 
     public void testExplicitBasedir1() {
         File dir1 = getProjectDir();
-        File dir2 = new File(TESTCASES_DIR);
+        File dir2 = project.resolveFile("..");
         testBaseDirs("explicitBasedir1", 
                      new String[] {dir1.getAbsolutePath(), 
                                    dir2.getAbsolutePath()
@@ -116,7 +113,7 @@ public class AntTest extends TaskdefsTest {
 
     public void testExplicitBasedir2() {
         File dir1 = getProjectDir();
-        File dir2 = new File(TESTCASES_DIR);
+        File dir2 = project.resolveFile("..");
         testBaseDirs("explicitBasedir2",
                      new String[] {dir1.getAbsolutePath(), 
                                    dir2.getAbsolutePath()
@@ -130,7 +127,7 @@ public class AntTest extends TaskdefsTest {
 
     public void testDoNotInheritBasedir() {
         File dir1 = getProjectDir();
-        File dir2 = new File(TASKDEFS_DIR+"/ant");
+        File dir2 = project.resolveFile("ant");
         String basedir = getProjectDir().getAbsolutePath();
         testBaseDirs("doNotInheritBasedir",
                      new String[] {dir1.getAbsolutePath(), 
@@ -140,7 +137,7 @@ public class AntTest extends TaskdefsTest {
 
     public void testBasedirTripleCall() {
         File dir1 = getProjectDir();
-        File dir2 = new File(TASKDEFS_DIR+"/ant");
+        File dir2 = project.resolveFile("ant");
         testBaseDirs("tripleCall", 
                      new String[] {dir1.getAbsolutePath(), 
                                    dir2.getAbsolutePath(),