diff -r e0637258a133 -r 3f5f9bc0bdc2 test/jdk/java/util/concurrent/tck/ConcurrentSkipListMapTest.java
--- a/test/jdk/java/util/concurrent/tck/ConcurrentSkipListMapTest.java	Tue Oct 03 13:41:55 2017 -0700
+++ b/test/jdk/java/util/concurrent/tck/ConcurrentSkipListMapTest.java	Tue Oct 03 13:45:11 2017 -0700
@@ -45,14 +45,25 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import junit.framework.Test;
-import junit.framework.TestSuite;
 
 public class ConcurrentSkipListMapTest extends JSR166TestCase {
     public static void main(String[] args) {
         main(suite(), args);
     }
     public static Test suite() {
-        return new TestSuite(ConcurrentSkipListMapTest.class);
+        class Implementation implements MapImplementation {
+            public Class<?> klazz() { return ConcurrentSkipListMap.class; }
+            public Map emptyMap() { return new ConcurrentSkipListMap(); }
+            public Object makeKey(int i) { return i; }
+            public Object makeValue(int i) { return i; }
+            public boolean isConcurrent() { return true; }
+            public boolean permitsNullKeys() { return false; }
+            public boolean permitsNullValues() { return false; }
+            public boolean supportsSetValue() { return false; }
+        }
+        return newTestSuite(
+            ConcurrentSkipListMapTest.class,
+            MapTest.testSuite(new Implementation()));
     }
 
     /**