diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index f1a878907..9e8dbdf37 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -126,17 +126,52 @@
   <target name="testEmptySkip">
     <mkdir dir="ziptest"/>
     <zip destfile="test3.zip" basedir="ziptest" whenempty="skip"/>
+    <fail message="archive should get skipped">
+      <condition>
+        <available file="test3.zip" />
+      </condition>
+    </fail>
   </target>
 
   <!-- Bugzilla Report 30365 -->
   <target name="zipEmptyDir">
     <mkdir dir="empty/empty2"/>
-      <zip destfile="test3.zip" basedir="empty" update="true"/>
+    <zip destfile="test3.zip" basedir="empty" update="true"/>
+    <fail message="single-directory archive should be created">
+      <condition>
+        <or>
+          <not>
+            <available file="test3.zip" />
+          </not>
+          <resourcecount when="gt" count="0">
+            <zipfileset src="test3.zip" />
+          </resourcecount>
+          <resourcecount when="ne" count="1">
+            <restrict>
+              <exists xmlns="antlib:org.apache.tools.ant.types.resources.selectors" />
+              <zipentry zipfile="test3.zip" name="empty2/" />
+            </restrict>
+          </resourcecount>
+        </or>
+      </condition>
+    </fail>
   </target>
 
   <target name="zipEmptyCreate">
     <mkdir dir="empty"/>
     <zip destfile="test3.zip" basedir="empty" whenempty="create" includes="*.xyz"/>
+    <fail message="empty archive should be created">
+      <condition>
+        <or>
+          <not>
+           <available file="test3.zip" />
+          </not>
+          <resourcecount when="gt" count="0">
+            <zipfileset src="test3.zip" />
+          </resourcecount>
+        </or>
+      </condition>
+    </fail>
   </target>
 
   <target name="testCompressionLevel" depends="test6">
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
index a5389e7f3..80100d16f 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -132,19 +132,13 @@ public class ZipTest extends BuildFileTest {
     // Bugzilla Report 22865
     public void testEmptySkip() {
         executeTarget("testEmptySkip");
-        assertTrue("archive should get skipped",
-                   !getProject().resolveFile("test3.zip").exists());
     }
     // Bugzilla Report 30365
     public void testZipEmptyDir() {
         executeTarget("zipEmptyDir");
-        assertTrue("archive should be created",
-                   getProject().resolveFile("test3.zip").exists());
     }
     public void testZipEmptyCreate() {
         expectLogContaining("zipEmptyCreate", "Note: creating empty");
-        assertTrue("archive should be created",
-                   getProject().resolveFile("test3.zip").exists());
     }
     // Bugzilla Report 25513
     public void testCompressionLevel() {