--- old/test/hotspot/jtreg/runtime/LoaderConstraints/duplicateLE/Test.java	2018-06-27 08:56:55.901013585 -0400
+++ new/test/hotspot/jtreg/runtime/LoaderConstraints/duplicateLE/Test.java	2018-06-27 08:56:54.425752391 -0400
@@ -40,26 +40,21 @@
     // Break each expectedErrorMessage into 2 parts due to the class loader name containing
     // the unique @<id> identity hash which cannot be compared against.
     static String expectedErrorMessage1_part1 = "loader PreemptingClassLoader @";
-    static String expectedErrorMessage1_part2 =
-        " (instance of PreemptingClassLoader, " +
-        "child of 'app' jdk.internal.loader.ClassLoaders$AppClassLoader) " +
-        "attempted duplicate class definition for test.Foo.";
+    static String expectedErrorMessage1_part2 = " attempted duplicate class definition for test.Foo. (test.Foo is in unnamed module of loader PreemptingClassLoader @";
+    static String expectedErrorMessage1_part3 = ", parent loader 'app')";
 
     // Check that all names have external formatting ('.' and not '/' in package names).
     // Check for name and parent of class loader.
     static String expectedErrorMessage2_part1 = "loader 'DuplicateLE_Test_Loader' @";
-    static String expectedErrorMessage2_part2 =
-        " (instance of PreemptingClassLoader, " +
-        "child of 'app' jdk.internal.loader.ClassLoaders$AppClassLoader) " +
-        "attempted duplicate class definition for test.Foo.";
+    static String expectedErrorMessage2_part2 = " attempted duplicate class definition for test.Foo. (test.Foo is in unnamed module of loader 'DuplicateLE_Test_Loader' @";
+    static String expectedErrorMessage2_part3 = ", parent loader 'app')";
 
     // Check that all names have external formatting ('.' and not '/' in package names).
     // Check for name and parent of class loader. Type should be mentioned as 'interface'.
     static String expectedErrorMessage3_part1 = "loader 'DuplicateLE_Test_Loader_IF' @";
-    static String expectedErrorMessage3_part2 =
-        " (instance of PreemptingClassLoader, " +
-        "child of 'app' jdk.internal.loader.ClassLoaders$AppClassLoader) " +
-        "attempted duplicate interface definition for test.J.";
+    static String expectedErrorMessage3_part2 = " attempted duplicate interface definition for test.J. (test.J is in unnamed module of loader 'DuplicateLE_Test_Loader_IF' @";
+    static String expectedErrorMessage3_part3 = ", parent loader 'app')";
+
 
     // Test that the error message is correct when a loader constraint error is
     // detected during vtable creation.
@@ -68,8 +63,11 @@
     // overrides "J.m()LFoo;".  But, Task's class Foo and super type J's class Foo
     // are different.  So, a LinkageError exception should be thrown because the
     // loader constraint check will fail.
-    public static void test(String loaderName, String expectedErrorMessage_part1,
-                            String expectedErrorMessage_part2, String testType) throws Exception {
+    public static void test(String loaderName,
+                            String expectedErrorMessage_part1,
+                            String expectedErrorMessage_part2,
+                            String expectedErrorMessage_part3,
+                            String testType) throws Exception {
         String[] classNames = {testType};
         ClassLoader l = new PreemptingClassLoader(loaderName, classNames, false);
         l.loadClass(testType);
@@ -79,7 +77,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);
@@ -89,9 +88,11 @@
     }
 
     public static void main(String args[]) throws Exception {
-        test(null, expectedErrorMessage1_part1, expectedErrorMessage1_part2, "test.Foo");
-        test("DuplicateLE_Test_Loader", expectedErrorMessage2_part1, expectedErrorMessage2_part2, "test.Foo");
-        test("DuplicateLE_Test_Loader_IF", expectedErrorMessage3_part1, expectedErrorMessage3_part2, "test.J");
+        test(null, expectedErrorMessage1_part1, expectedErrorMessage1_part2,
+             expectedErrorMessage1_part3, "test.Foo");
+        test("DuplicateLE_Test_Loader", expectedErrorMessage2_part1, expectedErrorMessage2_part2,
+             expectedErrorMessage2_part3, "test.Foo");
+        test("DuplicateLE_Test_Loader_IF", expectedErrorMessage3_part1, expectedErrorMessage3_part2,
+             expectedErrorMessage3_part3, "test.J");
     }
 }
-