diff --git a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
index b774af44b..42eab1e0e 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
@@ -69,21 +69,21 @@ public class EchoTest extends TaskdefsTest {
     
     // Output an empty String
     public void test1() { 
-        expectOutput("test1", "\n");
+        expectLog("test1", "");
     }
 
     // Output 'OUTPUT OF ECHO'
     public void test2() { 
-        expectOutput("test2", "OUTPUT OF ECHO\n");
+        expectLog("test2", "OUTPUT OF ECHO");
     }
     
     public void test3() { 
-        expectOutput("test3", "\n"+
+        expectLog("test3", "\n"+
                               "    This \n"+
                               "    is\n"+
                               "    a \n"+
                               "    multiline\n"+
                               "    message\n"+
-                              "    \n");
+                              "    ");
     }
 }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
index 41b9783ac..3f3b33643 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
@@ -72,9 +72,7 @@ public class MkdirTest extends TaskdefsTest {
     }
 
     public void test2() {
-        executeTarget("test2");
-        String log = getLog();
-        assert(log.indexOf("Warning: Specified directory is a file: ") > -1);
+        expectBuildException("test2", "directory already exists as a file");
     }
 
     public void test3() { 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
index 33668f2f0..1c3b07c78 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
@@ -213,6 +213,7 @@ public abstract class TaskdefsTest extends TestCase {
          */
         public void messageLogged(BuildEvent event) {
             if (event.getPriority() == Project.MSG_INFO ||
+                event.getPriority() == Project.MSG_WARN ||
                 event.getPriority() == Project.MSG_ERR)
             {
                 logBuffer.append(event.getMessage());