--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	2018-04-06 15:40:40.374883363 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	2018-04-06 15:40:40.086856201 -0700
@@ -89,19 +89,21 @@
         argsList.add("useAppLoader");
         opts = new String[argsList.size()];
         opts = argsList.toArray(opts);
-        OutputAnalyzer output = TestCommon.execCommon(opts);
-        output.shouldHaveExitValue(0)
-              .shouldContain(EXPECTED_EXCEPTION)
-              .shouldContain("CDS is disabled");
+        TestCommon.run(opts)
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldContain(EXPECTED_EXCEPTION);
+            });
 
         // case 4: load class in bootclasspath using boot loader with '--limit-modules java.base'
         argsList.remove(argsList.size() - 1);
         argsList.add("useBootLoader");
         opts = new String[argsList.size()];
         opts = argsList.toArray(opts);
-        output = TestCommon.execCommon(opts);
-        output.shouldHaveExitValue(0)
-              .shouldContain(EXPECTED_EXCEPTION)
-              .shouldContain("CDS is disabled");
+        TestCommon.run(opts)
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldContain(EXPECTED_EXCEPTION);
+            });
     }
 }