--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java	2018-04-08 23:07:25.562125592 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java	2018-04-08 23:07:25.282099205 -0700
@@ -77,9 +77,6 @@
             "-Xlog:class+load",
             "-Xlog:class+path=info",
             "PatchMain", "javax.naming.spi.NamingManager")
-            .assertSilentlyDisabledCDS(out -> {
-                out.shouldHaveExitValue(0)
-                   .shouldContain("I pass!");
-            });
+            .assertSilentlyDisabledCDS(0, "I pass!");
     }
 }