--- old/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	2018-06-05 19:29:33.558029243 +0200
+++ new/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	2018-06-05 19:29:33.462028314 +0200
@@ -48,21 +48,19 @@
 
 public class ClassLoaderHierarchyTest {
 
-//    jcmd  my-vm VM.classloaders
-//    +-- <bootstrap>
-//    |
-//    +-- platform (instance of jdk.internal.loader.ClassLoaders$PlatformClassLoader)
-//    |     |
-//    |     +-- app (instance of jdk.internal.loader.ClassLoaders$AppClassLoader)
-//    |
-//    +-- <unnamed> (instance of jdk.internal.reflect.DelegatingClassLoader)
-//    |
-//    +-- Kevin (instance of ClassLoaderHierarchyTest$TestClassLoader)
-//    |
-//    +-- <unnamed> (instance of ClassLoaderHierarchyTest$TestClassLoader)
-//          |
-//          +-- Bill (instance of ClassLoaderHierarchyTest$TestClassLoader)
-//
+//+-- <bootstrap>
+//      |
+//      +-- "platform", jdk.internal.loader.ClassLoaders$PlatformClassLoader
+//      |     |
+//      |     +-- "app", jdk.internal.loader.ClassLoaders$AppClassLoader
+//      |
+//      +-- jdk.internal.reflect.DelegatingClassLoader
+//      |
+//      +-- "Kevin", ClassLoaderHierarchyTest$TestClassLoader
+//      |
+//      +-- ClassLoaderHierarchyTest$TestClassLoader
+//            |
+//            +-- "Bill", ClassLoaderHierarchyTest$TestClassLoader
 
     public void run(CommandExecutor executor) throws ClassNotFoundException {
 
@@ -87,17 +85,17 @@
         // First test: simple output, no classes displayed
         OutputAnalyzer output = executor.execute("VM.classloaders");
         output.shouldContain("<bootstrap>");
-        output.shouldMatch("<unnamed>.*instance of.*TestClassLoader");
-        output.shouldMatch("Kevin.*instance of.*TestClassLoader");
-        output.shouldMatch("Bill.*instance of.*TestClassLoader");
+        output.shouldMatch(".*TestClassLoader");
+        output.shouldMatch("Kevin.*TestClassLoader");
+        output.shouldMatch("Bill.*TestClassLoader");
 
         // Second test: print with classes.
         output = executor.execute("VM.classloaders show-classes");
         output.shouldContain("<bootstrap>");
         output.shouldContain("java.lang.Object");
-        output.shouldMatch("<unnamed>.*instance of.*TestClassLoader");
-        output.shouldMatch("Kevin.*instance of.*TestClassLoader");
-        output.shouldMatch("Bill.*instance of.*TestClassLoader");
+        output.shouldMatch(".*TestClassLoader");
+        output.shouldMatch("Kevin.*TestClassLoader");
+        output.shouldMatch("Bill.*TestClassLoader");
         output.shouldContain("TestClass2");
     }