--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	2018-04-02 14:12:00.062902736 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	2018-04-02 14:11:59.791877198 -0700
@@ -89,13 +89,19 @@
         argsList.add("useAppLoader");
         opts = new String[argsList.size()];
         opts = argsList.toArray(opts);
-        TestCommon.run(opts).assertNormalExit(EXPECTED_EXCEPTION);
+        OutputAnalyzer output = TestCommon.execCommon(opts);
+        output.shouldHaveExitValue(0)
+              .shouldContain(EXPECTED_EXCEPTION)
+              .shouldContain("CDS is disabled");
 
         // 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);
-        TestCommon.run(opts).assertNormalExit(EXPECTED_EXCEPTION);
+        output = TestCommon.execCommon(opts);
+        output.shouldHaveExitValue(0)
+              .shouldContain(EXPECTED_EXCEPTION)
+              .shouldContain("CDS is disabled");
     }
 }