--- a/src/hotspot/share/runtime/vm_version.cpp	Wed Jun 20 16:56:02 2018 +0100
+++ b/src/hotspot/share/runtime/vm_version.cpp	Wed Jun 20 18:23:56 2018 +0100
@@ -115,7 +115,7 @@
 
 const char* Abstract_VM_Version::vm_vendor() {
 #ifdef VENDOR
-  return XSTR(VENDOR);
+  return VENDOR;
 #else
   return "Oracle Corporation";
 #endif

--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java	Wed Jun 20 16:56:02 2018 +0100
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java	Wed Jun 20 18:23:56 2018 +0100
@@ -166,9 +166,10 @@
                            APP_CLASS, BOOT_APPEND_DUPLICATE_MODULE_CLASS_NAME);
 
             String MATCH_PATTERN = ".class.load. javax.annotation.processing.FilerException source:.*bootAppend.jar*";
-            OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
-            out.shouldHaveExitValue(0)
-                       .shouldNotMatch(MATCH_PATTERN);
+            CDSTestUtils.run(opts)
+                .assertNormalExit(out -> {
+                    out.shouldNotMatch(MATCH_PATTERN);
+                });
         }
     }