--- old/test/hotspot/jtreg/gc/TestAgeOutput.java	2019-03-19 17:31:54.356259742 +0800
+++ new/test/hotspot/jtreg/gc/TestAgeOutput.java	2019-03-19 17:31:54.232259742 +0800
@@ -28,7 +28,7 @@
  * @bug 8164936
  * @summary Check that collectors using age table based aging print an age table even for the first garbage collection
  * @key gc
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.G1
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
@@ -42,7 +42,7 @@
  * @bug 8164936
  * @key gc
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
--- old/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java	2019-03-19 17:31:54.668259742 +0800
+++ new/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java	2019-03-19 17:31:54.564259742 +0800
@@ -29,7 +29,7 @@
 
 /* @test TestGenerationPerfCounter
  * @bug 8080345
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @library /test/lib /
  * @summary Tests that the sun.gc.policy.generations returns 2 for all GCs.
  * @modules java.base/jdk.internal.misc
@@ -44,7 +44,7 @@
 /* @test TestGenerationPerfCounterCMS
  * @bug 8080345
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib /
  * @summary Tests that the sun.gc.policy.generations returns 2 for all GCs.
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java	2019-03-19 17:31:54.984259742 +0800
+++ new/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java	2019-03-19 17:31:54.868259742 +0800
@@ -28,7 +28,7 @@
 /*
  * @test
  * @summary Test that verifies that iteration over large, plain Java objects, that potentially cross region boundaries on G1, with references in them works.
- * @requires vm.gc == "null"
+ * @requires vm.gc.Parallel & vm.gc.G1
  * @bug 8151499 8153734
  * @modules java.base/jdk.internal.vm.annotation
  * @run main/othervm -XX:+EnableContended -XX:-RestrictContended -Xmx128m -XX:+UseParallelGC -XX:ContendedPaddingWidth=8192 gc.TestHumongousReferenceObject
--- old/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java	2019-03-19 17:31:55.316259742 +0800
+++ new/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java	2019-03-19 17:31:55.204259742 +0800
@@ -34,7 +34,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @requires vm.gc == null
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @run main/othervm -XX:+UseG1GC gc.TestMemoryMXBeansAndPoolsPresence G1
  * @run main/othervm -XX:+UseParallelGC gc.TestMemoryMXBeansAndPoolsPresence Parallel
  * @run main/othervm -XX:+UseSerialGC gc.TestMemoryMXBeansAndPoolsPresence Serial
@@ -46,7 +46,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @comment Graal does not support CMS
- * @requires vm.gc == null & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @run main/othervm -XX:+UseConcMarkSweepGC gc.TestMemoryMXBeansAndPoolsPresence CMS
  */
 
--- old/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	2019-03-19 17:31:55.620259742 +0800
+++ new/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	2019-03-19 17:31:55.512259742 +0800
@@ -28,7 +28,7 @@
  * @bug 8165292
  * @summary Check that when PrintGCDetails is enabled, gc,task output is printed only once per collection.
  * @key gc
- * @requires vm.gc=="null"
+ * @requires vm.gc.G1
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
@@ -40,6 +40,7 @@
  * @test TestNumWorkerOutputCMS
  * @bug 8165292
  * @key gc
+ * @requires vm.gc.ConcMarkSweep
  * @comment Graal does not support CMS
  * @requires vm.gc=="null" & !vm.graal.enabled
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/TestPolicyNamePerfCounter.java	2019-03-19 17:31:55.936259742 +0800
+++ new/test/hotspot/jtreg/gc/TestPolicyNamePerfCounter.java	2019-03-19 17:31:55.812259742 +0800
@@ -29,7 +29,7 @@
 
 /* @test TestPolicyNamePerfCounter
  * @bug 8210192
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @library /test/lib /
  * @summary Tests that sun.gc.policy.name returns expected values for different GCs.
  * @modules java.base/jdk.internal.misc
@@ -44,7 +44,7 @@
 /* @test TestPolicyNamePerfCounterCMS
  * @bug 8210192
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib /
  * @summary Tests that sun.gc.policy.name returns expected values for different GCs.
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/TestSmallHeap.java	2019-03-19 17:31:56.244259742 +0800
+++ new/test/hotspot/jtreg/gc/TestSmallHeap.java	2019-03-19 17:31:56.136259742 +0800
@@ -26,7 +26,7 @@
 /**
  * @test TestSmallHeap
  * @bug 8067438 8152239
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1 & vm.gc.ConcMarkSweep
  * @summary Verify that starting the VM with a small heap works
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/TestSystemGC.java	2019-03-19 17:31:56.552259742 +0800
+++ new/test/hotspot/jtreg/gc/TestSystemGC.java	2019-03-19 17:31:56.448259742 +0800
@@ -26,7 +26,7 @@
 /*
  * @test TestSystemGC
  * @key gc
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @summary Runs System.gc() with different flags.
  * @run main/othervm gc.TestSystemGC
  * @run main/othervm -XX:+UseSerialGC gc.TestSystemGC
@@ -42,7 +42,7 @@
  * @test TestSystemGCCMS
  * @key gc
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @run main/othervm -XX:+UseConcMarkSweepGC gc.TestSystemGC
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent gc.TestSystemGC
  */
--- old/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java	2019-03-19 17:31:56.856259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java	2019-03-19 17:31:56.748259742 +0800
@@ -29,7 +29,7 @@
  * @summary All parallel GC variants may use large pages without the requirement that the
  * heap alignment is large page aligned. Other collectors also need to start up with odd sized heaps.
  * @bug 8024396
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:-UseLargePages gc.arguments.TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
@@ -45,7 +45,7 @@
  * @key gc regression
  * @bug 8024396
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseConcMarkSweepGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages
  * @run main/othervm -Xms71M -Xmx91M -XX:+UseConcMarkSweepGC -XX:-UseLargePages gc.arguments.TestAlignmentToUseLargePages
  */
--- old/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java	2019-03-19 17:31:57.156259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java	2019-03-19 17:31:57.048259742 +0800
@@ -29,7 +29,7 @@
  * @bug 7057939
  * @summary Make sure that MaxNewSize always has a useful value after argument
  * processing.
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -44,7 +44,7 @@
  * @key gc
  * @bug 7057939
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java	2019-03-19 17:31:57.464259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java	2019-03-19 17:31:57.352259742 +0800
@@ -27,6 +27,7 @@
  * @test TestMinInitialErgonomics
  * @key gc
  * @bug 8006088
+ * @requires vm.gc.Parallel
  * @summary Test ergonomics decisions related to minimum and initial heap size.
  * @library /test/lib
  * @library /
--- old/test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java	2019-03-19 17:31:57.792259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestParallelGCThreads.java	2019-03-19 17:31:57.676259742 +0800
@@ -27,6 +27,7 @@
  * @test TestParallelGCThreads
  * @key gc
  * @bug 8059527 8081382
+ * @requires vm.gc.ConcMarkSweep & vm.gc.Parallel & vm.gc.G1
  * @summary Tests argument processing for ParallelGCThreads
  * @library /test/lib
  * @library /
--- old/test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java	2019-03-19 17:31:58.108259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestParallelHeapSizeFlags.java	2019-03-19 17:31:58.000259742 +0800
@@ -29,7 +29,7 @@
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the
  * parallel collectors.
- * @requires vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @library /test/lib
  * @library /
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java	2019-03-19 17:31:58.420259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java	2019-03-19 17:31:58.304259742 +0800
@@ -26,6 +26,7 @@
 /*
  * @test TestParallelRefProc
  * @key gc
+ * @requires vm.gc.Serial & vm.gc.ConcMarkSweep & vm.gc.Parallel & vm.gc.G1
  * @summary Test defaults processing for -XX:+ParallelRefProcEnabled.
  * @library /test/lib
  * @run driver gc.arguments.TestParallelRefProc
--- old/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java	2019-03-19 17:31:58.720259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java	2019-03-19 17:31:58.612259742 +0800
@@ -29,7 +29,7 @@
  * @bug 8068582
  * @key gc
  * @library /test/lib
- * @requires vm.gc=="null"
+ * @requires vm.gc.G1
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver gc.arguments.TestSelectDefaultGC
--- old/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java	2019-03-19 17:31:59.020259742 +0800
+++ new/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java	2019-03-19 17:31:58.912259742 +0800
@@ -28,7 +28,7 @@
  * @key gc
  * @bug 8010722
  * @summary Tests ergonomics for UseCompressedOops.
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @library /test/lib
  * @library /
  * @modules java.base/jdk.internal.misc
@@ -47,7 +47,7 @@
  * @key gc
  * @bug 8010722
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib
  * @library /
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	2019-03-19 17:31:59.336259742 +0800
+++ new/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	2019-03-19 17:31:59.216259742 +0800
@@ -27,7 +27,7 @@
  * @test
  * @key gc
  * @bug 8049831
- * @requires !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java	2019-03-19 17:31:59.644259742 +0800
+++ new/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java	2019-03-19 17:31:59.536259742 +0800
@@ -30,6 +30,7 @@
  * @requires vm.gc == null
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.ClassUnloading != true
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -53,7 +54,7 @@
  * @key gc
  * @bug 8114823
  * @comment Graal does not support CMS
- * @requires vm.gc=="null" & !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.ClassUnloading != true
  * @library /test/lib
--- old/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java	2019-03-19 17:31:59.948259742 +0800
+++ new/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java	2019-03-19 17:31:59.844259742 +0800
@@ -27,6 +27,7 @@
  * @test
  * @key gc
  * @bug 8049831
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java	2019-03-19 17:32:00.268259742 +0800
+++ new/test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java	2019-03-19 17:32:00.160259742 +0800
@@ -28,7 +28,7 @@
  * @key gc regression
  * @summary Remove warning about CMS generation shrinking.
  * @bug 8012111
- * @requires !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java	2019-03-19 17:32:00.572259742 +0800
+++ new/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java	2019-03-19 17:32:00.456259742 +0800
@@ -27,7 +27,7 @@
  * @test TestDynamicNumberOfGCThreads
  * @bug 8017462
  * @summary Ensure that UseDynamicNumberOfGCThreads runs
- * @requires vm.gc=="null"
+ * @requires vm.gc.Parallel & vm.gc.G1 & vm.gc.ConcMarkSweep
  * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
--- old/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java	2019-03-19 17:32:00.876259742 +0800
+++ new/test/hotspot/jtreg/gc/ergonomics/TestInitialGCThreadLogging.java	2019-03-19 17:32:00.760259742 +0800
@@ -27,7 +27,7 @@
  * @test TestInitialGCThreadLogging
  * @bug 8157240
  * @summary Check trace logging of initial GC threads.
- * @requires vm.gc=="null"
+ * @requires vm.gc.Parallel & vm.gc.G1 & vm.gc.ConcMarkSweep
  * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
--- old/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java	2019-03-19 17:32:01.176259742 +0800
+++ new/test/hotspot/jtreg/gc/g1/TestShrinkDefragmentedHeap.java	2019-03-19 17:32:01.068259742 +0800
@@ -34,6 +34,7 @@
  *     3. invoke gc and check that memory returned to the system (amount of committed memory got down)
  *
  * @library /test/lib /
+ * @requires vm.gc.G1
  * @modules java.base/jdk.internal.misc
  *          java.management/sun.management
  * @run main gc.g1.TestShrinkDefragmentedHeap
--- old/test/hotspot/jtreg/gc/logging/TestGCId.java	2019-03-19 17:32:01.488259742 +0800
+++ new/test/hotspot/jtreg/gc/logging/TestGCId.java	2019-03-19 17:32:01.380259742 +0800
@@ -27,7 +27,7 @@
  * @test TestGCId
  * @bug 8043607
  * @summary Ensure that the GCId is logged
- * @requires vm.gc=="null"
+ * @requires vm.gc.Parallel & vm.gc.G1 & vm.gc.ConcMarkSweep & vm.gc.Serial
  * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java	2019-03-19 17:32:01.784259742 +0800
+++ new/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java	2019-03-19 17:32:01.676259742 +0800
@@ -39,7 +39,7 @@
  * @test TestMetaSpaceLog
  * @bug 8211123
  * @summary Ensure that the Metaspace is updated in the log
- * @requires vm.gc=="null"
+ * @requires vm.gc.Parallel & vm.gc.G1 & vm.gc.ConcMarkSweep & vm.gc.Serial
  * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/logging/TestPrintReferences.java	2019-03-19 17:32:02.096259742 +0800
+++ new/test/hotspot/jtreg/gc/logging/TestPrintReferences.java	2019-03-19 17:32:01.976259742 +0800
@@ -27,6 +27,7 @@
  * @test TestPrintReferences
  * @bug 8136991 8186402 8186465 8188245
  * @summary Validate the reference processing logging
+ * @requires vm.gc.G1
  * @key gc
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java	2019-03-19 17:32:02.400259742 +0800
+++ new/test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java	2019-03-19 17:32:02.292259742 +0800
@@ -30,7 +30,7 @@
 /* @test TestMetaspaceCMSCancel
  * @bug 8026752
  * @summary Tests cancel of CMS concurrent cycle for Metaspace after a full GC
- * @requires !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
--- old/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java	2019-03-19 17:32:02.704259742 +0800
+++ new/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java	2019-03-19 17:32:02.592259742 +0800
@@ -39,7 +39,7 @@
 
 /* @test TestMetaspacePerfCounters
  * @bug 8014659
- * @requires vm.gc=="null"
+ * @requires vm.gc.Serial & vm.gc.Parallel & vm.gc.G1
  * @library /test/lib /
  * @summary Tests that performance counters for metaspace and compressed class
  *          space exists and works.
--- old/test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java	2019-03-19 17:32:03.028259742 +0800
+++ new/test/hotspot/jtreg/gc/parallel/AdaptiveGCBoundary.java	2019-03-19 17:32:02.896259742 +0800
@@ -26,6 +26,7 @@
 /**
  * @test AdaptiveGCBoundary
  * @key gc regression
+ * @requires vm.gc.Parallel
  * @summary UseAdaptiveGCBoundary is broken
  * @bug 8014546
  * @library /test/lib
--- old/test/hotspot/jtreg/gc/startup_warnings/TestCMS.java	2019-03-19 17:32:03.364259742 +0800
+++ new/test/hotspot/jtreg/gc/startup_warnings/TestCMS.java	2019-03-19 17:32:03.248259742 +0800
@@ -28,7 +28,7 @@
  * @key gc
  * @bug 8006398 8155948 8179013
  * @summary Test that CMS prints a warning message
- * @requires !vm.graal.enabled
+ * @requires vm.gc.ConcMarkSweep & !vm.graal.enabled
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/hotspot/jtreg/gc/startup_warnings/TestG1.java	2019-03-19 17:32:03.676259742 +0800
+++ new/test/hotspot/jtreg/gc/startup_warnings/TestG1.java	2019-03-19 17:32:03.560259742 +0800
@@ -27,6 +27,7 @@
 * @test TestG1
 * @key gc
 * @bug 8006398
+* @requires vm.gc.G1
 * @summary Test that the G1 collector does not print a warning message
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java	2019-03-19 17:32:03.988259742 +0800
+++ new/test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java	2019-03-19 17:32:03.880259742 +0800
@@ -27,6 +27,7 @@
 * @test TestParallelGC
 * @key gc
 * @bug 8006398
+* @requires vm.gc.Parallel
 * @summary Test that ParallelGC does not print a warning message
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
--- old/test/hotspot/jtreg/gc/startup_warnings/TestParallelScavengeSerialOld.java	2019-03-19 17:32:04.296259742 +0800
+++ new/test/hotspot/jtreg/gc/startup_warnings/TestParallelScavengeSerialOld.java	2019-03-19 17:32:04.188259742 +0800
@@ -27,6 +27,7 @@
 * @test TestParallelScavengeSerialOld
 * @key gc
 * @bug 8006398
+* @requires vm.gc.Parallel
 * @summary Test that the ParallelScavenge+SerialOld combination does not print a warning message
 * @library /test/lib
 * @modules java.base/jdk.internal.misc