diff --git a/src/etc/testcases/taskdefs/available.xml b/src/etc/testcases/taskdefs/available.xml
index 9ad3bc526..97f9b92d4 100644
--- a/src/etc/testcases/taskdefs/available.xml
+++ b/src/etc/testcases/taskdefs/available.xml
@@ -78,4 +78,19 @@
                classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/>
   </target>
 
+  <target name="test16">
+    <available property="test" 
+               dir=""/>
+  </target>
+
+  <target name="test17">
+    <available property="test" 
+               dir="../taskdefs"/>
+  </target>
+
+  <target name="test18">
+    <available property="test" 
+               dir="../this_dir_should_never_exist"/>
+  </target>
+
 </project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
index 4dae554a8..eb2fe08d5 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
@@ -91,7 +91,7 @@ public class AvailableTest extends TaskdefsTest {
     // file does exist -> property 'test' == 'true'
     public void test5() { 
         executeTarget("test5");
-        assertEquals(project.getProperty("test"), "true");
+        assertEquals("true", project.getProperty("test"));
     }
     
     // resource doesn't exist -> property 'test' == null
@@ -103,7 +103,7 @@ public class AvailableTest extends TaskdefsTest {
     // resource does exist -> property 'test' == 'true'
     public void test7() { 
         executeTarget("test7");
-        assertEquals(project.getProperty("test"), "true");
+        assertEquals("true", project.getProperty("test"));
     }
 
     // class doesn't exist -> property 'test' == null
@@ -115,32 +115,32 @@ public class AvailableTest extends TaskdefsTest {
     // class does exist -> property 'test' == 'true'
     public void test9() { 
         executeTarget("test9");
-        assertEquals(project.getProperty("test"), "true");
+        assertEquals("true", project.getProperty("test"));
     }
     
     // All three specified and all three exist -> true
     public void test10() { 
         executeTarget("test10");
-        assertEquals(project.getProperty("test"), "true");
+        assertEquals("true", project.getProperty("test"));
     }
 
     // All three specified but class missing -> null
     public void test11() { 
         executeTarget("test11");
-        assertEquals(project.getProperty("test"), null);
+        assertEquals(null, project.getProperty("test"));
     }
 
     // Specified property-name is "" -> true
     public void test12() { 
         executeTarget("test12");
-        assertEquals(project.getProperty("test"), null);
-        assertEquals(project.getProperty(""), "true");
+        assertEquals(null, project.getProperty("test"));
+        assertEquals("true", project.getProperty(""));
     }
 
-    // Specified file is "" -> current directory should always exis :-)
+    // Specified file is "" -> invalid files do not exist
     public void test13() { 
         executeTarget("test13");
-        assertEquals(project.getProperty("test"), "true");
+        assertEquals(null, project.getProperty("test"));
     }
 
     // Specified resource is "" -> can such a thing exist?
@@ -155,6 +155,26 @@ public class AvailableTest extends TaskdefsTest {
     // Specified class is "" -> can not exist
     public void test15() { 
         executeTarget("test15");
-        assertEquals(project.getProperty("test"), null);
+        assertEquals(null, project.getProperty("test"));
+    }
+
+    // Specified dir is "" -> this is the current directory and should
+    // always exist
+    public void test16() { 
+        executeTarget("test16");
+        assertEquals("true", project.getProperty("test"));
+    }
+
+    // Specified dir is "../taskdefs" -> should exist since it's the 
+    // location of the buildfile used...
+    public void test17() { 
+        executeTarget("test17");
+        assertEquals("true", project.getProperty("test"));
+    }
+
+    // Specified dir is "../this_dir_should_never_exist" -> null
+    public void test18() { 
+        executeTarget("test18");
+        assertEquals(null, project.getProperty("test"));
     }
 }