--- old/test/hotspot/jtreg/runtime/LoaderConstraints/vtableLdrConstraint/Test.java	2019-04-11 14:27:01.898318000 +0200
+++ new/test/hotspot/jtreg/runtime/LoaderConstraints/vtableLdrConstraint/Test.java	2019-04-11 14:27:01.126318000 +0200
@@ -35,31 +35,25 @@
 
 public class Test {
 
-    // Break expected error messages into 2 parts since the loader name includes its identity
+    // Break expected error messages into 3 parts since the loader name includes its identity
     // hash which is unique and can't be compared against.
-    static String expectedErrorMessage1_part1 =
-        "loader constraint violation for class test.Task: " +
-        "when selecting overriding method test.Task.m()Ltest/Foo; " +
-        "the class loader PreemptingClassLoader @";
-    static String expectedErrorMessage1_part2 =
-        " (instance of PreemptingClassLoader, " +
-        "child of 'app' jdk.internal.loader.ClassLoaders$AppClassLoader) " +
-        "of the selected method's type test.Task, " +
-        "and the class loader 'app' (instance of jdk.internal.loader.ClassLoaders$AppClassLoader) " +
-        "for its super type test.J " +
-        "have different Class objects for the type test.Foo used in the signature";
-
-    static String expectedErrorMessage2_part1 =
-        "loader constraint violation for class test.Task: " +
-        "when selecting overriding method test.Task.m()Ltest/Foo; " +
-        "the class loader 'VtableLdrCnstrnt_Test_Loader' @";
-    static String expectedErrorMessage2_part2 =
-        " (instance of PreemptingClassLoader, " +
-        "child of 'app' jdk.internal.loader.ClassLoaders$AppClassLoader) " +
-        "of the selected method's type test.Task, " +
-        "and the class loader 'app' (instance of jdk.internal.loader.ClassLoaders$AppClassLoader) " +
-        "for its super type test.J " +
-        "have different Class objects for the type test.Foo used in the signature";
+    static String expectedErrorMessage1_part1 = "loader constraint violation for class test.Task: when " +
+                                                "selecting overriding method test.Task.m()Ltest/Foo; the " +
+                                                "class loader PreemptingClassLoader @";
+    static String expectedErrorMessage1_part2 = " of the selected method's type test.Task, and the class " +
+                                                "loader 'app' for its super type test.J have different Class objects " +
+                                                "for the type test.Foo used in the signature (test.Task is in unnamed " +
+                                                "module of loader PreemptingClassLoader @";
+    static String expectedErrorMessage1_part3 = ", parent loader 'app'; test.J is in unnamed module of loader 'app')";
+
+    static String expectedErrorMessage2_part1 = "loader constraint violation for class test.Task: when " +
+                                                "selecting overriding method test.Task.m()Ltest/Foo; the " +
+                                                "class loader 'VtableLdrCnstrnt_Test_Loader' @";
+    static String expectedErrorMessage2_part2 = " of the selected method's type test.Task, and the class " +
+                                                "loader 'app' for its super type test.J have different Class objects " +
+                                                "for the type test.Foo used in the signature (test.Task is in unnamed " +
+                                                "module of loader 'VtableLdrCnstrnt_Test_Loader' @";
+    static String expectedErrorMessage2_part3 = ", parent loader 'app'; test.J is in unnamed module of loader 'app')";
 
     // Test that the error message is correct when a loader constraint error is
     // detected during vtable creation.
@@ -70,7 +64,8 @@
     // loader constraint check will fail.
     public static void test(String loaderName,
                             String expectedErrorMessage_part1,
-                            String expectedErrorMessage_part2) throws Exception {
+                            String expectedErrorMessage_part2,
+                            String expectedErrorMessage_part3) throws Exception {
         Class<?> c = test.Foo.class; // Forces standard class loader to load Foo.
         String[] classNames = {"test.Task", "test.Foo", "test.I"};
         ClassLoader l = new PreemptingClassLoader(loaderName, classNames);
@@ -81,7 +76,8 @@
         } catch (LinkageError e) {
             String errorMsg = e.getMessage();
             if (!errorMsg.contains(expectedErrorMessage_part1) ||
-                !errorMsg.contains(expectedErrorMessage_part2)) {
+                !errorMsg.contains(expectedErrorMessage_part2) ||
+                !errorMsg.contains(expectedErrorMessage_part3)) {
                 System.out.println("Expected: " + expectedErrorMessage_part1 + "<id>" + expectedErrorMessage_part2 + "\n" +
                                    "but got:  " + errorMsg);
                 throw new RuntimeException("Wrong LinkageError exception thrown: " + errorMsg);
@@ -91,8 +87,9 @@
     }
 
     public static void main(String args[]) throws Exception {
-        test(null, expectedErrorMessage1_part1, expectedErrorMessage1_part2);
-        test("VtableLdrCnstrnt_Test_Loader", expectedErrorMessage2_part1, expectedErrorMessage2_part2);
+        test(null, expectedErrorMessage1_part1,
+             expectedErrorMessage1_part2, expectedErrorMessage1_part3);
+        test("VtableLdrCnstrnt_Test_Loader", expectedErrorMessage2_part1,
+             expectedErrorMessage2_part2, expectedErrorMessage2_part3);
     }
 }
-