--- a/jdk/test/java/lang/StackWalker/VerifyStackTrace.java	Tue May 24 13:51:35 2016 -0700
+++ b/jdk/test/java/lang/StackWalker/VerifyStackTrace.java	Tue May 24 18:41:31 2016 -0700
@@ -202,7 +202,7 @@
             // synthetic frames introduced by lambdas & method handles
             return produced.replaceAll(":[1-9][0-9]*\\)", ":00)")
                     .replaceAll("-internal/", "/").replaceAll("-ea/", "/")
-                    .replaceAll("java.base@[0-9]+/", "java.base/")
+                    .replaceAll("java.base@(\\d+\\.){0,3}(\\d+)/", "java.base/")
                     .replaceAll("/[0-9]+\\.run", "/xxxxxxxx.run")
                     .replaceAll("/[0-9]+\\.invoke", "/xxxxxxxx.invoke")
                     .replaceAll("\\$[0-9]+", "\\$??");