diff --git a/src/etc/testcases/taskdefs/copyfile.xml b/src/etc/testcases/taskdefs/copyfile.xml
index 6685d825e..34d3cd435 100644
--- a/src/etc/testcases/taskdefs/copyfile.xml
+++ b/src/etc/testcases/taskdefs/copyfile.xml
@@ -25,6 +25,7 @@
   </target>
 
   <target name="test6">
+    <delete file="testdir"/>
     <mkdir dir="testdir" />
     <copyfile src="copyfile.xml" 
               dest="testdir"
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index d4892b4d3..d2ef9d989 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -755,7 +755,7 @@ public class Project {
         if (overwrite || !destFile.exists() ||
             destFile.lastModified() < sourceFile.lastModified()) {
 
-            if (destFile.exists()) {
+            if (destFile.exists() && destFile.isFile()) {
                 destFile.delete();
             }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
index 7c26e4f5b..2c20e2a92 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
@@ -102,9 +102,4 @@ public class CopyfileTest extends TaskdefsTest {
             fail("Copy failed");
         }
     }
-/*
-    public void test6() { 
-        expectBuildException("test6", "target is directory");
-    }
-*/
 }