--- old/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java	2017-04-25 16:28:54.833553841 -0700
+++ new/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java	2017-04-25 16:28:54.769553843 -0700
@@ -27,6 +27,7 @@
  *          attempting to use CDS archive. JVM should exit gracefully
  *          when sharing mode is ON, and continue w/o sharing if sharing
  *          mode is AUTO.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/BootAppendTests.java	2017-04-25 16:28:55.077553833 -0700
+++ new/test/runtime/SharedArchiveFile/BootAppendTests.java	2017-04-25 16:28:55.013553835 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @summary Testing -Xbootclasspath/a support for CDS
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java	2017-04-25 16:28:55.305553827 -0700
+++ new/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java	2017-04-25 16:28:55.241553829 -0700
@@ -25,6 +25,7 @@
  * @test CdsDifferentCompactStrings
  * @summary CDS (class data sharing) requires the same -XX:[+-]CompactStrings
  *          setting between archive creation time and load time.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	2017-04-25 16:28:55.509553821 -0700
+++ new/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	2017-04-25 16:28:55.445553823 -0700
@@ -28,6 +28,7 @@
  *          This is a negative test; using  object alignment for loading that
  *          is different from object alignment for creating a CDS file
  *          should fail when loading.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @bug 8025642
  * @modules java.base/jdk.internal.misc
--- old/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java	2017-04-25 16:28:55.713553815 -0700
+++ new/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java	2017-04-25 16:28:55.649553816 -0700
@@ -25,6 +25,7 @@
  * @test CdsSameObjectAlignment
  * @summary Testing CDS (class data sharing) using varying object alignment.
  *          Using same object alignment for each dump/load pair
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	2017-04-25 16:28:55.921553808 -0700
+++ new/test/runtime/SharedArchiveFile/DefaultUseWithClient.java	2017-04-25 16:28:55.853553810 -0700
@@ -24,6 +24,7 @@
 /*
  * @test DefaultUseWithClient
  * @summary Test default behavior of sharing with -client
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/LargeSharedSpace.java	2017-04-25 16:28:56.125553802 -0700
+++ new/test/runtime/SharedArchiveFile/LargeSharedSpace.java	2017-04-25 16:28:56.061553804 -0700
@@ -26,6 +26,7 @@
  * @bug 8168790 8169870
  * @summary Test CDS dumping using specific space size without crashing.
  * The space size used in the test might not be suitable on windows.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @requires (os.family != "windows")
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- old/test/runtime/SharedArchiveFile/LimitSharedSizes.java	2017-04-25 16:28:56.337553796 -0700
+++ new/test/runtime/SharedArchiveFile/LimitSharedSizes.java	2017-04-25 16:28:56.273553798 -0700
@@ -23,6 +23,7 @@
 
 /* @test LimitSharedSizes
  * @summary Test handling of limits on shared space size
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib /runtime/CommandLine/OptionsValidation/common
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java	2017-04-25 16:28:56.545553790 -0700
+++ new/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java	2017-04-25 16:28:56.481553792 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8066670
  * @summary Testing -XX:+PrintSharedArchiveAndExit option
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/SASymbolTableTest.java	2017-04-25 16:28:56.753553784 -0700
+++ new/test/runtime/SharedArchiveFile/SASymbolTableTest.java	2017-04-25 16:28:56.689553786 -0700
@@ -24,6 +24,7 @@
 /*
  * @test SASymbolTableTest
  * @summary Walk symbol table using SA, with and without CDS.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot.oops
--- old/test/runtime/SharedArchiveFile/SharedArchiveFile.java	2017-04-25 16:28:56.957553778 -0700
+++ new/test/runtime/SharedArchiveFile/SharedArchiveFile.java	2017-04-25 16:28:56.893553780 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8014138
  * @summary Testing new -XX:SharedArchiveFile=<file-name> option
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -40,14 +41,14 @@
 // methods to form command line to create/use shared archive.
 public class SharedArchiveFile {
     public static void main(String[] args) throws Exception {
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true,
                                 "-XX:+UnlockDiagnosticVMOptions",
                                 "-XX:SharedArchiveFile=./SharedArchiveFile.jsa",
                                 "-Xshare:dump");
         OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "SharedArchiveFile");
         CDSTestUtils.checkDump(out);
 
-        pb = ProcessTools.createJavaProcessBuilder(
+        pb = ProcessTools.createJavaProcessBuilder(true,
                               "-XX:+UnlockDiagnosticVMOptions",
                               "-XX:SharedArchiveFile=./SharedArchiveFile.jsa",
                               "-Xshare:on", "-version");
--- old/test/runtime/SharedArchiveFile/SharedBaseAddress.java	2017-04-25 16:28:57.165553772 -0700
+++ new/test/runtime/SharedArchiveFile/SharedBaseAddress.java	2017-04-25 16:28:57.105553773 -0700
@@ -25,6 +25,7 @@
  * @test SharedBaseAddress
  * @summary Test variety of values for SharedBaseAddress, making sure
  *          VM handles normal values as well as edge values w/o a crash.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java	2017-04-25 16:28:57.373553765 -0700
+++ new/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java	2017-04-25 16:28:57.313553767 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8059510
  * @summary Test SharedSymbolTableBucketSize option
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	2017-04-25 16:28:57.581553759 -0700
+++ new/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java	2017-04-25 16:28:57.521553761 -0700
@@ -24,6 +24,7 @@
 /*
  * @test SpaceUtilizationCheck
  * @summary Check if the space utilization for shared spaces is adequate
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java	2017-04-25 16:28:57.789553753 -0700
+++ new/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java	2017-04-25 16:28:57.729553755 -0700
@@ -26,6 +26,7 @@
  * @bug 8169711
  * @summary Test interpreter method entries for intrinsics with CDS (class data sharing)
  *          and different settings of the intrinsic flag during dump/use of the archive.
+ * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management