--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java	2018-04-06 15:48:18.486083392 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java	2018-04-06 15:48:18.206056985 -0700
@@ -86,7 +86,8 @@
                 "--patch-module=java.naming=" + moduleJar,
                 "-Xlog:class+load",
                 "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         String classPath = appJar + File.pathSeparator + classDir;
         System.out.println("classPath: " + classPath);
@@ -96,9 +97,11 @@
             "--patch-module=java.naming=" + moduleJar,
             "-Xlog:class+load",
             "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello")
-          .assertNormalExit(
-            "I pass!",
-            "Hello!",
-            "Hello source: shared objects file");
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldContain("CDS is disabled")
+                   .shouldContain("I pass!")
+                   .shouldContain("Hello!");
+            });
     }
 }