--- a/jdk/test/tools/launcher/VersionCheck.java	Wed Dec 02 14:18:26 2015 -0800
+++ b/jdk/test/tools/launcher/VersionCheck.java	Wed Dec 02 14:31:52 2015 -0800
@@ -187,7 +187,7 @@
 
     static boolean compareInternalStrings() {
         int failcount = 0;
-        String bStr = refVersion.substring(refVersion.lastIndexOf("build") +
+        String bStr = refVersion.substring(refVersion.indexOf("build") +
                                            "build".length() + 1,
                                            refVersion.lastIndexOf(")"));