--- old/src/hotspot/share/runtime/arguments.cpp	2018-06-27 10:33:55.227250795 +0200
+++ new/src/hotspot/share/runtime/arguments.cpp	2018-06-27 10:33:54.956239055 +0200
@@ -3900,13 +3900,13 @@
   jint result = set_ergonomics_flags();
   if (result != JNI_OK) return result;
 
-  set_shared_spaces_flags();
-
   // Set heap size based on available physical memory
   set_heap_size();
 
   GCConfig::arguments()->initialize();
 
+  set_shared_spaces_flags();
+
   // Initialize Metaspace flags and alignments
   Metaspace::ergo_initialize();
 
--- old/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java	2018-06-27 10:33:55.621267864 +0200
+++ new/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java	2018-06-27 10:33:55.355256340 +0200
@@ -25,7 +25,7 @@
  * @test
  * @bug 8014138
  * @summary Testing new -XX:SharedArchiveFile=<file-name> option
- * @requires vm.cds
+ * @requires vm.cds.archived.java.heap
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	2018-06-27 10:33:55.996284109 +0200
+++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	2018-06-27 10:33:55.731272629 +0200
@@ -62,6 +62,7 @@
 
         // Uncompressed OOPs
         testDump(1, "-XX:+UseG1GC", "-XX:-UseCompressedOops", COOPS_DUMP_WARNING, true);
+        testDump(1, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseZGC", COOPS_DUMP_WARNING, true);
 
         // incompatible GCs
         testDump(2, "-XX:+UseParallelGC", "", GC_WARNING, false);