--- old/test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java	2018-04-10 11:23:30.527348577 -0700
+++ new/test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java	2018-04-10 11:23:30.319348670 -0700
@@ -49,7 +49,16 @@
         main(suite(), args);
     }
     public static Test suite() {
-        return new TestSuite(CopyOnWriteArraySetTest.class);
+        class Implementation implements CollectionImplementation {
+            public Class<?> klazz() { return CopyOnWriteArraySet.class; }
+            public Set emptyCollection() { return new CopyOnWriteArraySet(); }
+            public Object makeElement(int i) { return i; }
+            public boolean isConcurrent() { return true; }
+            public boolean permitsNulls() { return true; }
+        }
+        return newTestSuite(
+                CopyOnWriteArraySetTest.class,
+                CollectionTest.testSuite(new Implementation()));
     }
 
     static CopyOnWriteArraySet<Integer> populatedSet(int n) {