diff --git a/build.xml b/build.xml
index 739b7d2b4..6c7d0cf5f 100644
--- a/build.xml
+++ b/build.xml
@@ -333,7 +333,6 @@
     <exclude unless="run.failing.tests" name="${optional.package}/jdepend/JDependTest.java"/>
     <exclude unless="run.failing.tests" name="${optional.package}/DotnetTest.java"/>
     <exclude unless="run.failing.tests" name="${optional.package}/WsdlToDotnetTest.java"/>
-    <exclude unless="run.failing.tests" name="${ant.package}/taskdefs/CloneTest.java"/>
   </patternset>
 
   <!--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 592412c52..546ea8c06 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -784,6 +784,7 @@ public abstract class AbstractFileSet extends DataType
                         .addElement(((PatternSet) e.nextElement()).clone());
                 }
                 fs.selectors = (Vector) fs.selectors.clone();
+                fs.directoryScanner = null; // Clear the cached directory scanner
                 return fs;
             } catch (CloneNotSupportedException e) {
                 throw new BuildException(e);