diff --git a/src/etc/testcases/taskdefs/move.xml b/src/etc/testcases/taskdefs/move.xml
index b9ae5a21b..8c846ffc9 100644
--- a/src/etc/testcases/taskdefs/move.xml
+++ b/src/etc/testcases/taskdefs/move.xml
@@ -41,6 +41,15 @@
     </move>
   </target>
 
+  <!-- Bugzilla Report 18886 -->
+  <target name="testDirectoryRetaining">
+    <mkdir dir="A"/>
+    <mkdir dir="E"/>
+    <move todir="E">
+      <fileset dir="A"/>
+    </move>
+  </target>
+
   <target name="cleanup"> 
     <delete file="move.filterset.tmp"/>
     <delete file="move.filterchain.tmp"/>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java
index 3d046f0c6..84bf241fe 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java
@@ -109,4 +109,11 @@ public class MoveTest extends BuildFileTest {
         assertTrue(!getProject().resolveFile("A/C").exists());
         assertTrue(!getProject().resolveFile("A/D").exists());
     }
+
+    /** Bugzilla Report 18886 */
+    public void testDirectoryRetaining() throws IOException {
+        executeTarget("testDirectoryRetaining");
+        assertTrue(getProject().resolveFile("E").exists());
+        assertTrue(getProject().resolveFile("A").exists());
+    }
 }