--- jsr166/src/test/tck/JSR166TestCase.java	2015/09/04 18:16:28	1.136
+++ jsr166/src/test/tck/JSR166TestCase.java	2015/09/04 18:27:33	1.137
@@ -282,12 +282,13 @@ public class JSR166TestCase extends Test
     public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
     public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
     public static boolean atLeastJava9() {
-        // As of 2015-09, java9 still uses 52.0 class file version
-        return JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
+        return JAVA_CLASS_VERSION >= 53.0
+            // As of 2015-09, java9 still uses 52.0 class file version
+            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
     }
-    // public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; }
     public static boolean atLeastJava10() {
-        return JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
+        return JAVA_CLASS_VERSION >= 54.0
+            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
     }
 
     /**