diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java
index e5e7bf754..7d2376e99 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java
@@ -335,10 +335,10 @@ public class SOSTest {
      */
     private void checkCommandLines(String[] sTestCmdLine, String[] sGeneratedCmdLine) {
         int length = sTestCmdLine.length;
+        assertEquals("number of arguments doesn't match", length, sGeneratedCmdLine.length);
         for (int i = 0; i < length; i++) {
             assertEquals("arg # " + String.valueOf(i),
                     sTestCmdLine[i], sGeneratedCmdLine[i]);
         }
-        assertEquals("extra args", sTestCmdLine.length, sGeneratedCmdLine.length);
     }
 }
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
index e313f3b7f..fa6712226 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
@@ -39,6 +39,7 @@ import org.junit.rules.ExpectedException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  *  Testcase to ensure that command line generation and required attributes are correct.
@@ -449,6 +450,7 @@ public class MSVSSTest implements MSVSSConstants {
                 genIndex++;
                 continue;
             }
+            assertTrue("missing arg " + sTestCmdLine[testIndex], genIndex < genLength);
             assertEquals("arg # " + testIndex,
                     sTestCmdLine[testIndex], sGeneratedCmdLine[genIndex]);
             testIndex++;