--- old/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java	2019-08-27 10:06:38.569071116 -0700
+++ new/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java	2019-08-27 10:06:38.325062302 -0700
@@ -116,7 +116,7 @@
           output.shouldMatch("should be non-existent: .*cpattrX.jar");
         });
 
-    // Now make nonExistPath exist. CDS will fail to load.
+    // Now make nonExistPath exist. CDS still loads, but archived non-system classes will not be used.
     Files.copy(Paths.get(cp), Paths.get(nonExistPath),
                StandardCopyOption.REPLACE_EXISTING);
 
@@ -124,9 +124,8 @@
         "-Xlog:class+path",
         "-cp", cp,
         "CpAttr6")
-      .assertAbnormalExit(output -> {
-          output.shouldMatch("should be non-existent: .*cpattrX.jar");
-          output.shouldMatch("file must not exist: .*cpattrX.jar");
+      .assertNormalExit(output -> {
+          output.shouldMatch("Archived non-system classes are disabled because the file .*/cpattrX.jar exists");
         });
   }