--- old/src/hotspot/share/runtime/arguments.cpp	2018-06-27 09:09:20.989001108 +0200
+++ new/src/hotspot/share/runtime/arguments.cpp	2018-06-27 09:09:20.727989793 +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 09:09:21.414019532 +0200
+++ new/test/hotspot/jtreg/runtime/SharedArchiveFile/SharedArchiveFile.java	2018-06-27 09:09:21.142007741 +0200
@@ -24,8 +24,9 @@
 /**
  * @test
  * @bug 8014138
+ * @bug 8205702
  * @summary Testing new -XX:SharedArchiveFile=<file-name> option
- * @requires vm.cds
+ * @requires vm.cds & vm.gc != "Z"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	2018-06-27 09:09:21.812036786 +0200
+++ new/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java	2018-06-27 09:09:21.539024951 +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);