diff --git a/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java b/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
index 61c9a4345..460333ef1 100644
--- a/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
+++ b/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
@@ -62,7 +62,7 @@ import java.util.*;
 /**
  * JUnit 3 testcases for org.apache.tools.ant.IntrospectionHelper.
  *
- * @author Stefan Bodewig <a href="mailto:stefan.bodewig@megabit.net">stefan.bodewig@megabit.net</a> 
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  */
 
 public class IntrospectionHelperTest extends TestCase {
@@ -409,7 +409,7 @@ public class IntrospectionHelperTest extends TestCase {
         if (isUnixStyle) { 
             assertEquals("/tmp/2", f.getAbsolutePath());
         } else {
-            assertEquals("c:\\tmp\\2", f.getAbsolutePath().toLowerCase());
+            assertEquals(":\\tmp\\2", f.getAbsolutePath().toLowerCase().substring(1));
         }
     }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
index fe323aa5a..69b112850 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
@@ -80,7 +80,7 @@ public class CopydirTest extends TaskdefsTest {
     }
 
     public void test4() { 
-        expectLog("test4", "Warning: src == dest");
+        expectLog("test4", "DEPRECATED - The copydir task is deprecated.  Use copy instead.Warning: src == dest");
     }
     
     public void test5() { 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
index ed9b7fa43..50cbf2b23 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
@@ -80,7 +80,7 @@ public class CopyfileTest extends TaskdefsTest {
     }
 
     public void test4() { 
-        expectLog("test4", "Warning: src == dest");
+        expectLog("test4", "DEPRECATED - The copyfile task is deprecated.  Use copy instead.Warning: src == dest");
     }
 
     public void test5() { 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
index 7fd04c34e..797f48f89 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
@@ -75,9 +75,10 @@ public class DeleteTest extends TaskdefsTest {
         executeTarget("test2");
     }
 
-    public void test3() { 
-        expectBuildException("test3", "Not a directory");
-    }
+    // delete now handles files *and* directories --SB
+//    public void test3() { 
+//        expectBuildException("test3", "Not a directory");
+//    }
 
     public void test4() { 
         executeTarget("test4");
diff --git a/src/testcases/org/apache/tools/ant/types/PathTest.java b/src/testcases/org/apache/tools/ant/types/PathTest.java
index 2bc9897c8..ea2cd2199 100644
--- a/src/testcases/org/apache/tools/ant/types/PathTest.java
+++ b/src/testcases/org/apache/tools/ant/types/PathTest.java
@@ -65,7 +65,7 @@ import java.io.File;
 /**
  * JUnit 3 testcases for org.apache.tools.ant.types.Path
  *
- * @author <a href="mailto:stefan.bodewig@megabit.net">Stefan Bodewig</a> 
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  */
 
 public class PathTest extends TestCase {
@@ -92,8 +92,8 @@ public class PathTest extends TestCase {
             assertEquals("/a", l[0]);
             assertEquals("/b", l[1]);
         } else {
-            assertEquals("\\a", l[0]);
-            assertEquals("\\b", l[1]);
+            assertEquals(":\\a", l[0].substring(1));
+            assertEquals(":\\b", l[1].substring(1));
         }        
 
         p = new Path(project, "\\a;\\b");
@@ -103,8 +103,8 @@ public class PathTest extends TestCase {
             assertEquals("/a", l[0]);
             assertEquals("/b", l[1]);
         } else {
-            assertEquals("\\a", l[0]);
-            assertEquals("\\b", l[1]);
+            assertEquals(":\\a", l[0].substring(1));
+            assertEquals(":\\b", l[1].substring(1));
         }        
 
         p = new Path(project, "\\a;\\b:/c");
@@ -115,9 +115,9 @@ public class PathTest extends TestCase {
             assertEquals("/b", l[1]);
             assertEquals("/c", l[2]);
         } else {
-            assertEquals("\\a", l[0]);
-            assertEquals("\\b", l[1]);
-            assertEquals("\\c", l[2]);
+            assertEquals(":\\a", l[0].substring(1));
+            assertEquals(":\\b", l[1].substring(1));
+            assertEquals(":\\c", l[2].substring(1));
         }        
 
         p = new Path(project, "c:\\test");
@@ -154,7 +154,7 @@ public class PathTest extends TestCase {
             assertEquals("/a", l[0]);
         } else {
             assertEquals(1, l.length);
-            assertEquals("\\a", l[0]);
+            assertEquals(":\\a", l[0].substring(1));
         }
     }
 
@@ -314,7 +314,7 @@ public class PathTest extends TestCase {
         if (isUnixStyle) {
             assertEquals("/a", l[0]);
         } else {
-            assertEquals("\\a", l[0]);
+            assertEquals(":\\a", l[0].substring(1));
         }
     }