--- a/langtools/test/tools/javac/options/modes/SourceTargetTest.java	Wed Jul 05 20:36:16 2017 +0200
+++ b/langtools/test/tools/javac/options/modes/SourceTargetTest.java	Thu Jun 11 00:23:18 2015 +0200
@@ -45,7 +45,10 @@
     @Test
     void testSourceTarget() throws IOException {
         String v = System.getProperty("java.specification.version");
-        String latest = v.substring(v.lastIndexOf(".") + 1);
+        String[] va = v.split("\\.");
+        int major = Integer.parseInt(va[0]);
+        boolean newVersion = major > 8;
+        String latest = (newVersion) ? va[0] : va[1];
         String prev = String.valueOf(Integer.valueOf(latest) - 1);
 
         writeFile("C.java", "class C { }");