--- jsr166/src/test/tck/CollectionTest.java	2016/10/17 00:57:45	1.2
+++ jsr166/src/test/tck/CollectionTest.java	2016/10/17 01:34:10	1.3
@@ -9,6 +9,7 @@ import java.util.Collection;
 import java.util.Deque;
 import java.util.NoSuchElementException;
 import java.util.Queue;
+import java.util.function.Consumer;
 
 import junit.framework.Test;
 
@@ -45,7 +46,11 @@ public class CollectionTest extends JSR1
             Object[] a = new Object[0];
             assertSame(a, c.toArray(a));
         }
-        c.forEach((e) -> { throw new AssertionError(); });
+        Consumer alwaysThrows = (e) -> { throw new AssertionError(); };
+        c.forEach(alwaysThrows);
+        c.iterator().forEachRemaining(alwaysThrows);
+        c.spliterator().forEachRemaining(alwaysThrows);
+        assertFalse(c.spliterator().tryAdvance(alwaysThrows));
         if (Queue.class.isAssignableFrom(impl.klazz())) {
             Queue q = (Queue) c;
             assertNull(q.peek());
@@ -97,6 +102,9 @@ public class CollectionTest extends JSR1
 
     public void testNoSuchElementExceptions() {
         Collection c = impl.emptyCollection();
+        assertThrows(
+            NoSuchElementException.class,
+            () -> c.iterator().next());
 
         if (Queue.class.isAssignableFrom(impl.klazz())) {
             Queue q = (Queue) c;