diff --git a/src/etc/testcases/taskdefs/move.xml b/src/etc/testcases/taskdefs/move.xml
index 8c846ffc9..abdc09202 100644
--- a/src/etc/testcases/taskdefs/move.xml
+++ b/src/etc/testcases/taskdefs/move.xml
@@ -44,7 +44,16 @@
   <!-- Bugzilla Report 18886 -->
   <target name="testDirectoryRetaining">
     <mkdir dir="A"/>
+    <touch file="A/1"/>
     <mkdir dir="E"/>
+    <move todir="E" includeemptydirs="true">
+      <fileset dir="A" includes="1"/>
+    </move>
+  </target>
+
+  <target name="testCompleteDirectoryMove">
+    <mkdir dir="A"/>
+    <touch file="A/1"/>
     <move todir="E">
       <fileset dir="A"/>
     </move>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java
index 84bf241fe..d58cfd2e5 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java
@@ -114,6 +114,16 @@ public class MoveTest extends BuildFileTest {
     public void testDirectoryRetaining() throws IOException {
         executeTarget("testDirectoryRetaining");
         assertTrue(getProject().resolveFile("E").exists());
+        assertTrue(getProject().resolveFile("E/1").exists());
+        assertTrue(!getProject().resolveFile("A/1").exists());
         assertTrue(getProject().resolveFile("A").exists());
     }
+
+    public void testCompleteDirectoryMove() throws IOException {
+        executeTarget("testCompleteDirectoryMove");
+        assertTrue(getProject().resolveFile("E").exists());
+        assertTrue(getProject().resolveFile("E/1").exists());
+        assertTrue(!getProject().resolveFile("A/1").exists());
+        assertTrue(!getProject().resolveFile("A").exists());
+    }
 }