--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	2018-04-08 23:07:27.725329437 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	2018-04-08 23:07:27.442302767 -0700
@@ -90,10 +90,7 @@
         opts = new String[argsList.size()];
         opts = argsList.toArray(opts);
         TestCommon.run(opts)
-            .assertSilentlyDisabledCDS(out -> {
-                out.shouldHaveExitValue(0)
-                   .shouldContain(EXPECTED_EXCEPTION);
-            });
+            .assertSilentlyDisabledCDS(0, EXPECTED_EXCEPTION);
 
         // case 4: load class in bootclasspath using boot loader with '--limit-modules java.base'
         argsList.remove(argsList.size() - 1);
@@ -101,9 +98,6 @@
         opts = new String[argsList.size()];
         opts = argsList.toArray(opts);
         TestCommon.run(opts)
-            .assertSilentlyDisabledCDS(out -> {
-                out.shouldHaveExitValue(0)
-                   .shouldContain(EXPECTED_EXCEPTION);
-            });
+            .assertSilentlyDisabledCDS(0, EXPECTED_EXCEPTION);
     }
 }