diff --git a/build.xml b/build.xml
index 685b7bada..62db94c6f 100644
--- a/build.xml
+++ b/build.xml
@@ -1612,6 +1612,8 @@
           <!--  These tests only passes if testcases and Ant classes have
           been loaded by the same classloader - will throw
           IllegalAccessExceptions otherwise.  -->
+          <exclude name="${ant.package}/DirectoryScannerTest.java"
+                   unless="tests.and.ant.share.classloader"/>
           <exclude name="${ant.package}/taskdefs/SQLExecTest.java"
                    unless="tests.and.ant.share.classloader"/>
           <exclude name="${ant.package}/taskdefs/cvslib/ChangeLogWriterTest.java"
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index 10f9e62c5..256f52204 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -1587,7 +1587,7 @@ public class DirectoryScanner
      * Set is live and should not be modified.
      * @return the Set of relative directory names that have been scanned.
      */
-    public Set getScannedDirs() {
+    /* package-private */ Set getScannedDirs() {
         return scannedDirs;
     }