--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java	2018-04-06 15:40:38.219680123 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java	2018-04-06 15:40:37.941653904 -0700
@@ -93,15 +93,16 @@
 
         String classPath = appJar + File.pathSeparator + classDir;
         System.out.println("classPath: " + classPath);
-        output = TestCommon.execCommon(
+        TestCommon.run(
             "-XX:+UnlockDiagnosticVMOptions",
             "-cp", classPath,
             "--patch-module=java.naming=" + moduleJar,
             "-Xlog:class+load",
-            "PatchMain", "javax.naming.Reference", "mypackage.MyReference");
-        output.shouldHaveExitValue(0)
-              .shouldContain("CDS is disabled")
-              .shouldContain("MyReference source: file:")
-              .shouldContain("I pass!");
+            "PatchMain", "javax.naming.Reference", "mypackage.MyReference")
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldContain("MyReference source: file:")
+                   .shouldContain("I pass!");
+            });
     }
 }