--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java	2018-04-08 23:07:23.456927214 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java	2018-04-08 23:07:23.169900166 -0700
@@ -97,11 +97,6 @@
             "--patch-module=java.naming=" + moduleJar,
             "-Xlog:class+load",
             "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello")
-            .assertSilentlyDisabledCDS(out -> {
-                out.shouldHaveExitValue(0)
-                   .shouldContain("CDS is disabled")
-                   .shouldContain("I pass!")
-                   .shouldContain("Hello!");
-            });
+            .assertSilentlyDisabledCDS(0, "I pass!", "Hello!");
     }
 }