--- jsr166/src/test/tck/Collection8Test.java	2016/11/28 17:53:59	1.35
+++ jsr166/src/test/tck/Collection8Test.java	2016/11/28 17:59:47	1.36
@@ -563,6 +563,10 @@ public class Collection8Test extends JSR
         final Object one = impl.makeElement(1);
         final Object two = impl.makeElement(2);
         final Consumer checkSanity = x -> assertTrue(x == one || x == two);
+        final Consumer<Object[]> checkArraySanity = array -> {
+            assertTrue(array.length <= 2);
+            for (Object x : array) assertTrue(x == one || x == two);
+        };
         final Object[] emptyArray =
             (Object[]) java.lang.reflect.Array.newInstance(one.getClass(), 0);
         final List<Future<?>> futures;
@@ -582,8 +586,8 @@ public class Collection8Test extends JSR
                 do {} while (s.tryAdvance(checkSanity));
             },
             () -> { for (Object x : c) checkSanity.accept(x); },
-            () -> { for (Object x : c.toArray()) checkSanity.accept(x); },
-            () -> { for (Object x : c.toArray(emptyArray)) checkSanity.accept(x); },
+            () -> checkArraySanity.accept(c.toArray()),
+            () -> checkArraySanity.accept(c.toArray(emptyArray)),
             () -> {
                 assertTrue(c.add(one));
                 assertTrue(c.contains(one));