--- a/hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java	Wed Aug 30 19:18:22 2017 -0400
+++ b/hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java	Mon Aug 28 15:34:04 2017 -0700
@@ -205,7 +205,11 @@
             OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
             CDSTestUtils.checkExec(out, opts, "[class,load] org.omg.CORBA.Context");
             if (!CDSTestUtils.isUnableToMap(out)) {
-                out.shouldMatch(".*\\[class,load\\] org.omg.CORBA.Context source:.*bootAppend.jar");
+                if (mode.equals("off")) {
+                    out.shouldMatch(".*\\[class,load\\] org.omg.CORBA.Context source:.*bootAppend.jar");
+                } else {
+                    CDSTestUtils.checkExec(out, opts, "[class,load] org.omg.CORBA.Context source: shared objects file");
+                }
             }
         }
     }