--- a/test/hotspot/jtreg/runtime/appcds/DumpClassList.java	Tue Nov 28 09:47:04 2017 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/DumpClassList.java	Wed Nov 29 18:43:35 2017 -0800
@@ -93,11 +93,11 @@
         output = TestCommon.createArchive(appJar, appClass,
                                           "-Xbootclasspath/a:" + appendJar,
                                           "-XX:+UnlockDiagnosticVMOptions",
-                                          "-XX:+PrintSystemDictionaryAtExit",
+                                          "-Xlog:class+load",
                                           "-XX:SharedClassListFile=" + classList);
         TestCommon.checkDump(output)
             .shouldNotContain("Preload Warning: Cannot find java/lang/invoke/LambdaForm")
             .shouldNotContain("Preload Warning: Cannot find boot/append/Foo")
-            .shouldContain("boot.append.Foo, loader <shared, not restored>");
+            .shouldContain("[info][class,load] boot.append.Foo");
     }
 }

--- a/test/hotspot/jtreg/runtime/appcds/ProhibitedPackage.java	Tue Nov 28 09:47:04 2017 -0800
+++ b/test/hotspot/jtreg/runtime/appcds/ProhibitedPackage.java	Wed Nov 29 18:43:35 2017 -0800
@@ -55,11 +55,9 @@
 
             // Make sure a class in a prohibited package for a custom loader
             // will be ignored during dumping.
-            TestCommon.dump(appJar,
-                            classlist,
-                            "-XX:+PrintSystemDictionaryAtExit")
+            TestCommon.dump(appJar,  classlist, "-Xlog:cds")
                 .shouldContain("Dumping")
-                .shouldNotContain("java.lang.Prohibited")
+                .shouldContain("[cds] Prohibited package for non-bootstrap classes: java/lang/Prohibited.class")
                 .shouldHaveExitValue(0);
         }
 
@@ -68,9 +66,9 @@
         // will be ignored during dumping.
         TestCommon.dump(appJar,
                         TestCommon.list("java/lang/Prohibited", "ProhibitedHelper"),
-                        "-XX:+PrintSystemDictionaryAtExit")
+                        "-Xlog:class+load")
             .shouldContain("Dumping")
-            .shouldNotContain("java.lang.Prohibited")
+            .shouldNotContain("[info][class,load] java.lang.Prohibited source: ")
             .shouldHaveExitValue(0);
 
         // Try loading the class in a prohibited package with various -Xshare