*** old/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	Mon Apr  2 14:12:00 2018
--- new/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	Mon Apr  2 14:11:59 2018

*** 87,101 ****
--- 87,107 ----
          argsList.add(1, "java.base");
          argsList.remove(argsList.size() - 1);
          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");
      }
  }