diff --git a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
index c7cd74392..6cf18186a 100644
--- a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -80,8 +80,8 @@ public class ConcatFilterTest extends BuildFileTest {
 
     public void testFilterReaderNoArgs() throws IOException {
         executeTarget("testFilterReaderNoArgs");
-        File expected = getProject().resolveFile("input/concatfilter.test");
-        File result = getProject().resolveFile("result/concat.FilterReaderNoArgs.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"input/concatfilter.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/concat.FilterReaderNoArgs.test");
         assertTrue("testFilterReaderNoArgs: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
@@ -140,7 +140,7 @@ public class ConcatFilterTest extends BuildFileTest {
     protected String read(String filename) {
         String content = null;
         try {
-            File file = getProject().resolveFile(filename);
+            File file = FILE_UTILS.resolveFile(getProject().getBaseDir(), filename);
             java.io.FileReader rdr = new java.io.FileReader(file);
             content = FileUtils.readFully(rdr);
             rdr.close();
diff --git a/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java b/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
index 99a427760..3d3eb8cbd 100644
--- a/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
@@ -28,6 +28,8 @@ import org.apache.tools.ant.util.FileUtils;
  */
 public class DynamicFilterTest extends BuildFileTest {
 
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+    
     public DynamicFilterTest(String name) {
         super(name);
     }
@@ -54,7 +56,7 @@ public class DynamicFilterTest extends BuildFileTest {
     {
         Reader r = null;
         try {
-            r = new FileReader(getProject().resolveFile(filename));
+            r = new FileReader(FILE_UTILS.resolveFile(getProject().getBaseDir(), filename));
             return  FileUtils.readFully(r);
         }
         finally {
diff --git a/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java b/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java
index 63535e1ee..ae8f5cf72 100644
--- a/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@ public class EscapeUnicodeTest extends BuildFileTest {
 
     public void testEscapeUnicode() throws IOException {
         executeTarget("testEscapeUnicode");
-        File expected = getProject().resolveFile("expected/escapeunicode.test");
-        File result = getProject().resolveFile("result/escapeunicode.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(), "expected/escapeunicode.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/escapeunicode.test");
         assertTrue(FILE_UTILS.contentEquals(expected, result));
     }
 
diff --git a/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java b/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java
index c7ffbbf96..31685d56f 100644
--- a/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -46,37 +46,37 @@ public class HeadTailTest extends BuildFileTest {
 
     public void testHead() throws IOException {
         executeTarget("testHead");
-        File expected = getProject().resolveFile("expected/head-tail.head.test");
-        File result = getProject().resolveFile("result/head-tail.head.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(), "expected/head-tail.head.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/head-tail.head.test");
         assertTrue("testHead: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testHeadLines() throws IOException {
         executeTarget("testHeadLines");
-        File expected = getProject().resolveFile("expected/head-tail.headLines.test");
-        File result = getProject().resolveFile("result/head-tail.headLines.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(), "expected/head-tail.headLines.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(), "result/head-tail.headLines.test");
         assertTrue("testHeadLines: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testHeadSkip() throws IOException {
         executeTarget("testHeadSkip");
-        File expected = getProject().resolveFile("expected/head-tail.headSkip.test");
-        File result = getProject().resolveFile("result/head-tail.headSkip.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.headSkip.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.headSkip.test");
         assertTrue("testHeadSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testHeadLinesSkip() throws IOException {
         executeTarget("testHeadLinesSkip");
-        File expected = getProject().resolveFile("expected/head-tail.headLinesSkip.test");
-        File result = getProject().resolveFile("result/head-tail.headLinesSkip.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.headLinesSkip.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.headLinesSkip.test");
         assertTrue("testHeadLinesSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testFilterReaderHeadLinesSkip() throws IOException {
         executeTarget("testFilterReaderHeadLinesSkip");
-        File expected = getProject().resolveFile(
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),
             "expected/head-tail.headLinesSkip.test");
-        File result = getProject().resolveFile(
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),
             "result/head-tail.filterReaderHeadLinesSkip.test");
         assertTrue("testFilterReaderHeadLinesSkip: Result not like expected",
                    FILE_UTILS.contentEquals(expected, result));
@@ -84,37 +84,37 @@ public class HeadTailTest extends BuildFileTest {
 
     public void testTail() throws IOException {
         executeTarget("testTail");
-        File expected = getProject().resolveFile("expected/head-tail.tail.test");
-        File result = getProject().resolveFile("result/head-tail.tail.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tail.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tail.test");
         assertTrue("testTail: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testTailLines() throws IOException {
         executeTarget("testTailLines");
-        File expected = getProject().resolveFile("expected/head-tail.tailLines.test");
-        File result = getProject().resolveFile("result/head-tail.tailLines.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tailLines.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tailLines.test");
         assertTrue("testTailLines: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testTailSkip() throws IOException {
         executeTarget("testTailSkip");
-        File expected = getProject().resolveFile("expected/head-tail.tailSkip.test");
-        File result = getProject().resolveFile("result/head-tail.tailSkip.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tailSkip.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tailSkip.test");
         assertTrue("testTailSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testTailLinesSkip() throws IOException {
         executeTarget("testTailLinesSkip");
-        File expected = getProject().resolveFile("expected/head-tail.tailLinesSkip.test");
-        File result = getProject().resolveFile("result/head-tail.tailLinesSkip.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.tailLinesSkip.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.tailLinesSkip.test");
         assertTrue("testTailLinesSkip: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
     public void testFilterReaderTailLinesSkip() throws IOException {
         executeTarget("testFilterReaderTailLinesSkip");
-        File expected = getProject().resolveFile(
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),
             "expected/head-tail.tailLinesSkip.test");
-        File result = getProject().resolveFile(
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),
             "result/head-tail.filterReaderTailLinesSkip.test");
         assertTrue("testFilterReaderTailLinesSkip: Result not like expected",
                    FILE_UTILS.contentEquals(expected, result));
@@ -122,8 +122,8 @@ public class HeadTailTest extends BuildFileTest {
 
     public void testHeadTail() throws IOException {
         executeTarget("testHeadTail");
-        File expected = getProject().resolveFile("expected/head-tail.headtail.test");
-        File result = getProject().resolveFile("result/head-tail.headtail.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/head-tail.headtail.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/head-tail.headtail.test");
         assertTrue("testHeadTail: Result not like expected", FILE_UTILS.contentEquals(expected, result));
     }
 
diff --git a/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java b/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java
index 49fe390c4..81d68da92 100644
--- a/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2002-2005 The Apache Software Foundation
+ * Copyright  2002-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@ public class LineContainsTest extends BuildFileTest {
 
     public void testLineContains() throws IOException {
         executeTarget("testLineContains");
-        File expected = getProject().resolveFile("expected/linecontains.test");
-        File result = getProject().resolveFile("result/linecontains.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/linecontains.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/linecontains.test");
         assertTrue(FILE_UTILS.contentEquals(expected, result));
     }
 
diff --git a/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java b/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java
index 2d00922af..1ff8850a1 100644
--- a/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@ public class ReplaceTokensTest extends BuildFileTest {
 
     public void testReplaceTokens() throws IOException {
         executeTarget("testReplaceTokens");
-        File expected = getProject().resolveFile("expected/replacetokens.test");
-        File result = getProject().resolveFile("result/replacetokens.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/replacetokens.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/replacetokens.test");
         assertTrue(FILE_UTILS.contentEquals(expected, result));
     }
 
diff --git a/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java b/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java
index a298acdec..73e08daae 100644
--- a/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@ public class StripJavaCommentsTest extends BuildFileTest {
 
     public void testStripJavaComments() throws IOException {
         executeTarget("testStripJavaComments");
-        File expected = getProject().resolveFile("expected/stripjavacomments.test");
-        File result = getProject().resolveFile("result/stripjavacomments.test");
+        File expected = FILE_UTILS.resolveFile(getProject().getBaseDir(),"expected/stripjavacomments.test");
+        File result = FILE_UTILS.resolveFile(getProject().getBaseDir(),"result/stripjavacomments.test");
         assertTrue(FILE_UTILS.contentEquals(expected, result));
     }
 
diff --git a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
index b8e46f705..927199c70 100644
--- a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
@@ -28,6 +28,8 @@ import org.apache.tools.ant.util.FileUtils;
  */
 public class TokenFilterTest extends BuildFileTest {
 
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+    
     public TokenFilterTest(String name) {
         super(name);
     }
@@ -246,7 +248,7 @@ public class TokenFilterTest extends BuildFileTest {
     {
         Reader r = null;
         try {
-            r = new FileReader(getProject().resolveFile(filename));
+            r = new FileReader(FILE_UTILS.resolveFile(getProject().getBaseDir(),filename));
             return  FileUtils.readFully(r);
         }
         finally {