--- old/test/gc/TestCardTablePageCommits.java	Mon Aug 29 17:04:41 2016
+++ new/test/gc/TestCardTablePageCommits.java	Mon Aug 29 17:04:41 2016
@@ -34,7 +34,6 @@
  * @requires vm.gc.Parallel
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver TestCardTablePageCommits
  */
 public class TestCardTablePageCommits {
--- old/test/gc/TestObjectAlignment.java	Mon Aug 29 17:04:42 2016
+++ new/test/gc/TestObjectAlignment.java	Mon Aug 29 17:04:41 2016
@@ -28,7 +28,6 @@
  * @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.management
  * @run main/othervm TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=8
  * @run main/othervm TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=16
  * @run main/othervm TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=32
--- old/test/gc/TestSmallHeap.java	Mon Aug 29 17:04:42 2016
+++ new/test/gc/TestSmallHeap.java	Mon Aug 29 17:04:42 2016
@@ -28,7 +28,6 @@
  * @summary Verify that starting the VM with a small heap works
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- * @modules java.management/sun.management
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestSmallHeap
--- old/test/gc/TestSoftReferencesBehaviorOnOOME.java	Mon Aug 29 17:04:43 2016
+++ new/test/gc/TestSoftReferencesBehaviorOnOOME.java	Mon Aug 29 17:04:43 2016
@@ -27,7 +27,6 @@
  * @summary Tests that all SoftReferences has been cleared at time of OOM.
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.management
  * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 512 2k
  * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 128k 256k
  * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 2k 32k
--- old/test/gc/TestVerifyDuringStartup.java	Mon Aug 29 17:04:44 2016
+++ new/test/gc/TestVerifyDuringStartup.java	Mon Aug 29 17:04:44 2016
@@ -27,7 +27,6 @@
  * @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.management
  */
 
 import jdk.test.lib.JDKToolFinder;
--- old/test/gc/TestVerifySilently.java	Mon Aug 29 17:04:45 2016
+++ new/test/gc/TestVerifySilently.java	Mon Aug 29 17:04:45 2016
@@ -27,7 +27,6 @@
  * @summary Test silent verification.
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.management
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/gc/TestVerifySubSet.java	Mon Aug 29 17:04:46 2016
+++ new/test/gc/TestVerifySubSet.java	Mon Aug 29 17:04:45 2016
@@ -27,7 +27,6 @@
  * @summary Test VerifySubSet option
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.management
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/gc/g1/TestEagerReclaimHumongousRegions.java	Mon Aug 29 17:04:46 2016
+++ new/test/gc/g1/TestEagerReclaimHumongousRegions.java	Mon Aug 29 17:04:46 2016
@@ -27,6 +27,7 @@
  * @summary Test to make sure that eager reclaim of humongous objects work. We simply try to fill
  * up the heap with humongous objects that should be eagerly reclaimable to avoid Full GC.
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java	Mon Aug 29 17:04:47 2016
+++ new/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java	Mon Aug 29 17:04:47 2016
@@ -27,6 +27,7 @@
  * @summary Test to make sure that eager reclaim of humongous objects correctly clears
  * mark bitmaps at reclaim.
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java	Mon Aug 29 17:04:48 2016
+++ new/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java	Mon Aug 29 17:04:48 2016
@@ -30,6 +30,7 @@
  * referencing that we know is in the old gen. After changing this reference, the object
  * should still be eagerly reclaimable to avoid Full GC.
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java	Mon Aug 29 17:04:49 2016
+++ new/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java	Mon Aug 29 17:04:48 2016
@@ -27,6 +27,7 @@
  * @summary Ensure that the output for a G1TraceEagerReclaimHumongousObjects
  * includes the expected necessary messages.
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestGCLogMessages.java	Mon Aug 29 17:04:49 2016
+++ new/test/gc/g1/TestGCLogMessages.java	Mon Aug 29 17:04:49 2016
@@ -27,6 +27,7 @@
  * @summary Ensure the output for a minor GC with G1
  * includes the expected necessary messages.
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestHumongousAllocInitialMark.java	Mon Aug 29 17:04:50 2016
+++ new/test/gc/g1/TestHumongousAllocInitialMark.java	Mon Aug 29 17:04:50 2016
@@ -25,6 +25,7 @@
  * @test TestHumongousAllocInitialMark
  * @bug 7168848
  * @summary G1: humongous object allocations should initiate marking cycles when necessary
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestHumongousAllocNearlyFullRegion.java	Mon Aug 29 17:04:51 2016
+++ new/test/gc/g1/TestHumongousAllocNearlyFullRegion.java	Mon Aug 29 17:04:51 2016
@@ -26,6 +26,7 @@
  * @bug 8143587
  * @summary G1: humongous object allocations should work even when there is
  *              not enough space in the heapRegion to fit a filler object.
+ * @requires vm.gc.G1
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @run driver TestHumongousAllocNearlyFullRegion
--- old/test/gc/g1/TestHumongousCodeCacheRoots.java	Mon Aug 29 17:04:52 2016
+++ new/test/gc/g1/TestHumongousCodeCacheRoots.java	Mon Aug 29 17:04:52 2016
@@ -26,6 +26,7 @@
  * @key regression
  * @key gc
  * @bug 8027756
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestPrintRegionRememberedSetInfo.java	Mon Aug 29 17:04:52 2016
+++ new/test/gc/g1/TestPrintRegionRememberedSetInfo.java	Mon Aug 29 17:04:52 2016
@@ -26,6 +26,7 @@
  * @key gc
  * @bug 8014240
  * @summary Test output of G1PrintRegionRememberedSetInfo
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringDeduplicationAgeThreshold.java	Mon Aug 29 17:04:53 2016
+++ new/test/gc/g1/TestStringDeduplicationAgeThreshold.java	Mon Aug 29 17:04:53 2016
@@ -26,6 +26,7 @@
  * @summary Test string deduplication age threshold
  * @bug 8029075
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringDeduplicationFullGC.java	Mon Aug 29 17:04:54 2016
+++ new/test/gc/g1/TestStringDeduplicationFullGC.java	Mon Aug 29 17:04:54 2016
@@ -26,6 +26,7 @@
  * @summary Test string deduplication during full GC
  * @bug 8029075
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringDeduplicationInterned.java	Mon Aug 29 17:04:55 2016
+++ new/test/gc/g1/TestStringDeduplicationInterned.java	Mon Aug 29 17:04:55 2016
@@ -26,6 +26,7 @@
  * @summary Test string deduplication of interned strings
  * @bug 8029075
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringDeduplicationPrintOptions.java	Mon Aug 29 17:04:56 2016
+++ new/test/gc/g1/TestStringDeduplicationPrintOptions.java	Mon Aug 29 17:04:55 2016
@@ -26,6 +26,7 @@
  * @summary Test string deduplication print options
  * @bug 8029075
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringDeduplicationTableRehash.java	Mon Aug 29 17:04:56 2016
+++ new/test/gc/g1/TestStringDeduplicationTableRehash.java	Mon Aug 29 17:04:56 2016
@@ -26,6 +26,7 @@
  * @summary Test string deduplication table rehash
  * @bug 8029075
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringDeduplicationTableResize.java	Mon Aug 29 17:04:57 2016
+++ new/test/gc/g1/TestStringDeduplicationTableResize.java	Mon Aug 29 17:04:57 2016
@@ -26,6 +26,7 @@
  * @summary Test string deduplication table resize
  * @bug 8029075
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringDeduplicationYoungGC.java	Mon Aug 29 17:04:58 2016
+++ new/test/gc/g1/TestStringDeduplicationYoungGC.java	Mon Aug 29 17:04:58 2016
@@ -26,6 +26,7 @@
  * @summary Test string deduplication during young GC
  * @bug 8029075
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/g1/TestStringSymbolTableStats.java	Mon Aug 29 17:04:59 2016
+++ new/test/gc/g1/TestStringSymbolTableStats.java	Mon Aug 29 17:04:58 2016
@@ -26,6 +26,7 @@
  * @bug 8027476 8027455
  * @summary Ensure that the G1TraceStringSymbolTableScrubbing prints the expected message.
  * @key gc
+ * @requires vm.gc.G1
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- old/test/gc/serial/HeapChangeLogging.java	Mon Aug 29 17:04:59 2016
+++ new/test/gc/serial/HeapChangeLogging.java	Mon Aug 29 17:04:59 2016
@@ -24,9 +24,9 @@
 /*
  * @test HeapChangeLogging.java
  * @bug 8027440
+ * @requires vm.gc.Serial
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.management
  * @summary Allocate to get a promotion failure and verify that that heap change logging is present.
  * @run main HeapChangeLogging
  */