--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java	2018-04-02 14:11:58.622767034 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java	2018-04-02 14:11:58.341740554 -0700
@@ -87,14 +87,17 @@
                 "-Xlog:class+load",
                 "-Xlog:class+path=info",
                 "PatchMain", "javax.naming.spi.NamingManager");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
-        TestCommon.run(
+        output = TestCommon.execCommon(
             "-XX:+UnlockDiagnosticVMOptions",
             "--patch-module=java.naming=" + moduleJar2 + File.pathSeparator + moduleJar,
             "-Xlog:class+load",
             "-Xlog:class+path=info",
-            "PatchMain", "javax.naming.spi.NamingManager")
-          .assertNormalExit("I pass");
+            "PatchMain", "javax.naming.spi.NamingManager");
+        output.shouldHaveExitValue(0)
+              .shouldContain("CDS is disabled")
+              .shouldContain("I pass!");
     }
 }