diff --git a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
index d504af50d..c154a69c6 100644
--- a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
+++ b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
@@ -444,8 +444,17 @@ public class FileUtilsTest extends TestCase {
     public void testToURI() {
         String dosRoot = null;
         if (Os.isFamily("dos") || Os.isFamily("netware")) {
-            dosRoot = Character.toUpperCase(
-                System.getProperty("user.dir").charAt(0)) + ":/";
+            dosRoot = System.getProperty("user.dir")
+                .substring(0, 3).replace(File.separatorChar, '/');
+
+            //preserve case on Cygwin when using 1.4 toURI:
+            Class uriClazz = null;
+            try {
+                uriClazz = Class.forName("java.net.URI");
+            } catch (ClassNotFoundException e) {
+                // OK, Java 1.3.
+                dosRoot = dosRoot.toUpperCase();
+            }
         }
         else
         {