diff --git a/src/etc/testcases/core/directoryscanner.xml b/src/etc/testcases/core/directoryscanner.xml
index 90a6dca7f..31a5fc884 100644
--- a/src/etc/testcases/core/directoryscanner.xml
+++ b/src/etc/testcases/core/directoryscanner.xml
@@ -5,6 +5,10 @@
         <touch file="${tmp.dir}/alpha/beta/gamma/gamma.xml"/>
         <touch file="${tmp.dir}/alpha/beta/beta.xml"/>
     </target>
+    <target name="children-of-excluded-dir-setup" depends="setup">
+        <mkdir dir="${tmp.dir}/delta"/>
+        <touch file="${tmp.dir}/delta/delta.xml"/>
+    </target>
     <target name="cleanup">
         <delete dir="${tmp.dir}" quiet="true"/>
     </target>
diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
index ba234ca90..263d103aa 100644
--- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
+++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
@@ -351,40 +351,25 @@ public class DirectoryScannerTest extends BuildFileTest {
      * Test inspired by Bug#1415.
      */
     public void testChildrenOfExcludedDirectory() {
-        File dir = new File("src/main/org/apache/tools");
+        getProject().executeTarget("children-of-excluded-dir-setup");
         DirectoryScanner ds = new DirectoryScanner();
-        ds.setBasedir(dir);
-        ds.setExcludes(new String[] {"ant/**"});
+        ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+        ds.setExcludes(new String[] {"alpha/**"});
+        ds.setFollowSymlinks(false);
         ds.scan();
-
-        boolean haveZipPackage = false;
-        boolean haveTaskdefsPackage = false;
-        String[] included = ds.getIncludedDirectories();
-        for (int i=0; i<included.length; i++) {
-            if (included[i].equals("zip")) {
-                haveZipPackage = true;
-            } else if (included[i].equals("ant"+File.separator+"taskdefs")) {
-                haveTaskdefsPackage = true;
-            }
-        }
-        assertTrue("(1) zip package included", haveZipPackage);
-        assertTrue("(1) taskdefs package not included", !haveTaskdefsPackage);
+        compareFiles(ds, new String[] {"delta/delta.xml"},
+                    new String[] {"", "delta"});
 
         ds = new DirectoryScanner();
-        ds.setBasedir(dir);
-        ds.setExcludes(new String[] {"ant"});
+        ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));
+        ds.setExcludes(new String[] {"alpha"});
+        ds.setFollowSymlinks(false);
         ds.scan();
-        haveZipPackage = false;
-        included = ds.getIncludedDirectories();
-        for (int i=0; i<included.length; i++) {
-            if (included[i].equals("zip")) {
-                haveZipPackage = true;
-            } else if (included[i].equals("ant"+File.separator+"taskdefs")) {
-                haveTaskdefsPackage = true;
-            }
-        }
-        assertTrue("(2) zip package included", haveZipPackage);
-        assertTrue("(2) taskdefs package included", haveTaskdefsPackage);
+        compareFiles(ds, new String[] {"alpha/beta/beta.xml",
+                                       "alpha/beta/gamma/gamma.xml",
+                                        "delta/delta.xml"},
+                     new String[] {"", "alpha/beta", "alpha/beta/gamma", "delta"});
+
     }
 
     private void compareFiles(DirectoryScanner ds, String[] expectedFiles,