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