--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java	Tue Feb 19 10:04:44 2019 +0100
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java	Tue Feb 19 10:04:53 2019 +0100
@@ -36,7 +36,6 @@
  * @summary Test clhsdb jhisto command
  * @requires vm.hasSA
  * @requires vm.gc != "Shenandoah"
- * @requires vm.gc != "Z"
  * @library /test/lib
  * @run main/othervm ClhsdbJhisto
  */

--- a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java	Tue Feb 19 10:04:44 2019 +0100
+++ b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java	Tue Feb 19 10:04:53 2019 +0100
@@ -50,7 +50,6 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSAandCanAttach & os.family != "mac"
- * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities

--- a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java	Tue Feb 19 10:04:44 2019 +0100
+++ b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForLargeArray.java	Tue Feb 19 10:04:53 2019 +0100
@@ -48,7 +48,6 @@
  * @bug 8171084
  * @requires vm.hasSAandCanAttach & (vm.bits == "64" & os.maxMemory > 8g)
  * @requires vm.gc != "Shenandoah"
- * @requires vm.gc != "Z"
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities

--- a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java	Tue Feb 19 10:04:44 2019 +0100
+++ b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java	Tue Feb 19 10:04:53 2019 +0100
@@ -138,19 +138,8 @@
         if (dumpFile.exists() && dumpFile.isFile()) {
             HprofParser.parse(dumpFile);
         } else {
-            boolean ZGCUsed = false;
-
-            for (String opt: Utils.getFilteredTestJavaOpts()) {
-                if (opt.contains("+UseZGC")) {
-                    ZGCUsed = true;
-                    break;
-                }
-            }
-
-            if (!ZGCUsed) {
-                throw new RuntimeException(
-                    "Could not find dump file " + dumpFile.getAbsolutePath());
-            }
+          throw new RuntimeException(
+            "Could not find dump file " + dumpFile.getAbsolutePath());
         }
 
         System.out.println("PASSED");