diff --git a/test/langtools/tools/javac/6402516/TestClass.java b/test/langtools/tools/javac/6402516/TestClass.java
index f080fbc22b43e..57131cddaf96b 100644
--- a/test/langtools/tools/javac/6402516/TestClass.java
+++ b/test/langtools/tools/javac/6402516/TestClass.java
@@ -26,32 +26,32 @@
 
 class Test {
     void m1(int m1_arg) {
-        String x = "Test; 0; 0";
-        String y = "Test; 0; 0";
-        String z = "Test; 0; 0";
+        String x = "Test; 0; 0; 0";
+        String y = "Test; 0; 0; 0";
+        String z = "Test; 0; 0; 0";
         Object o = new Object() {
             public boolean equals(Object other) {
-                String p = "-; Test; 0; 0";
-                String q = "-; Test; 0; 0";
-                String r = "-; Test; 0; 0";
+                String p = "-; Test; 0; 0; 0";
+                String q = "-; Test; 0; 0; 0";
+                String r = "-; Test; 0; 0; 0";
                 return (this == other);
             }
         };
     }
 
-    String s = "Test; 0; 0";
+    String s = "Test; 0; 0; 0";
 
     boolean b = new Object() {
             public boolean equals(Object other) {
-                String p = "-; Test; 0; 0";
-                String q = "-; Test; 0; 0";
-                String r = "-; Test; 0; 0";
+                String p = "-; Test; 0; 0; 0";
+                String q = "-; Test; 0; 0; 0";
+                String r = "-; Test; 0; 0; 0";
                 return (this == other);
             }
 
     }.equals(null);
 
     class Test2 {
-        String s = "Test.Test2; Test; 0; 0";
+        String s = "Test.Test2; Test; 0; 0; 0";
     }
 }
diff --git a/test/langtools/tools/javac/6402516/TestLocalElements.java b/test/langtools/tools/javac/6402516/TestLocalElements.java
index 589d2e993cb7c..7b835bfdcc30e 100644
--- a/test/langtools/tools/javac/6402516/TestLocalElements.java
+++ b/test/langtools/tools/javac/6402516/TestLocalElements.java
@@ -23,29 +23,29 @@
 
 import java.util.List;
 import java.io.*;
-//TOPLEVEL_SCOPE:List, Test2, Test; java.io.*, java.lang.*
+//TOPLEVEL_SCOPE:List, Test2, Test; java.io.*, java.lang.*;
 class Test {
     void m1(int m1_arg) {
-        String x = "x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*";
-        String y = "y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*";
-        String z = "z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*";
+        String x = "x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*;";
+        String y = "y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*;";
+        String z = "z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*;";
         Object o = new Object() {
             public boolean equals(Object other) {
-                String p = "p, other, super, this; -, o, z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*";
-                String q = "q, p, other, super, this; -, o, z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*";
-                String r = "r, q, p, other, super, this; -, o, z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*";
+                String p = "p, other, super, this; -, o, z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*;";
+                String q = "q, p, other, super, this; -, o, z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*;";
+                String r = "r, q, p, other, super, this; -, o, z, y, x, m1_arg, super, this; List, Test2, Test; java.io.*, java.lang.*;";
                 return (this == other);
             }
         };
     }
 
-    String s = "super, this; List, Test2, Test; java.io.*, java.lang.*";
+    String s = "super, this; List, Test2, Test; java.io.*, java.lang.*;";
 
     boolean b = new Object() {
             public boolean equals(Object other) {
-                String p = "p, other, super, this; -, super, this; List, Test2, Test; java.io.*, java.lang.*";
-                String q = "q, p, other, super, this; -, super, this; List, Test2, Test; java.io.*, java.lang.*";
-                String r = "r, q, p, other, super, this; -, super, this; List, Test2, Test; java.io.*, java.lang.*";
+                String p = "p, other, super, this; -, super, this; List, Test2, Test; java.io.*, java.lang.*;";
+                String q = "q, p, other, super, this; -, super, this; List, Test2, Test; java.io.*, java.lang.*;";
+                String r = "r, q, p, other, super, this; -, super, this; List, Test2, Test; java.io.*, java.lang.*;";
                 return (this == other);
             }
 
diff --git a/test/langtools/tools/javac/6402516/TestMethod.java b/test/langtools/tools/javac/6402516/TestMethod.java
index 9aec1d5d881c8..304b0abd9cb34 100644
--- a/test/langtools/tools/javac/6402516/TestMethod.java
+++ b/test/langtools/tools/javac/6402516/TestMethod.java
@@ -25,32 +25,32 @@
 
 class Test {
     void m1(int m1_arg) {
-        String x = "m1; 0; 0";
-        String y = "m1; 0; 0";
-        String z = "m1; 0; 0";
+        String x = "m1; 0; 0; 0";
+        String y = "m1; 0; 0; 0";
+        String z = "m1; 0; 0; 0";
         Object o = new Object() {
             public boolean equals(Object other) {
-                String p = "equals; m1; 0; 0";
-                String q = "equals; m1; 0; 0";
-                String r = "equals; m1; 0; 0";
+                String p = "equals; m1; 0; 0; 0";
+                String q = "equals; m1; 0; 0; 0";
+                String r = "equals; m1; 0; 0; 0";
                 return (this == other);
             }
         };
     }
 
-    String s = "0; 0; 0";
+    String s = "0; 0; 0; 0";
 
     boolean b = new Object() {
             public boolean equals(Object other) {
-                String p = "equals; 0; 0; 0";
-                String q = "equals; 0; 0; 0";
-                String r = "equals; 0; 0; 0";
+                String p = "equals; 0; 0; 0; 0";
+                String q = "equals; 0; 0; 0; 0";
+                String r = "equals; 0; 0; 0; 0";
                 return (this == other);
             }
 
     }.equals(null);
 
     class Test2 {
-        String s = "0; 0; 0; 0";
+        String s = "0; 0; 0; 0; 0";
     }
 }