--- jsr166/src/test/tck/Collection8Test.java	2016/11/05 01:27:00	1.10
+++ jsr166/src/test/tck/Collection8Test.java	2016/11/05 16:10:38	1.12
@@ -59,6 +59,17 @@ public class Collection8Test extends JSR
     /** Checks properties of empty collections. */
     public void testEmptyMeansEmpty() {
         Collection c = impl.emptyCollection();
+        emptyMeansEmpty(c);
+
+        if (c instanceof java.io.Serializable)
+            emptyMeansEmpty(serialClone(c));
+
+        Collection clone = cloneableClone(c);
+        if (clone != null)
+            emptyMeansEmpty(clone);
+    }
+
+    void emptyMeansEmpty(Collection c) {
         assertTrue(c.isEmpty());
         assertEquals(0, c.size());
         assertEquals("[]", c.toString());
@@ -92,12 +103,12 @@ public class Collection8Test extends JSR
             assertEquals(0, c.spliterator().estimateSize());
         assertFalse(c.contains(bomb()));
         assertFalse(c.remove(bomb()));
-        if (Queue.class.isAssignableFrom(impl.klazz())) {
+        if (c instanceof Queue) {
             Queue q = (Queue) c;
             assertNull(q.peek());
             assertNull(q.poll());
         }
-        if (Deque.class.isAssignableFrom(impl.klazz())) {
+        if (c instanceof Deque) {
             Deque d = (Deque) c;
             assertNull(d.peekFirst());
             assertNull(d.peekLast());