--- old/test/jdk/TEST.ROOT	2019-05-21 15:56:05.000000000 -0700
+++ new/test/jdk/TEST.ROOT	2019-05-21 15:56:05.000000000 -0700
@@ -43,6 +43,7 @@
     sun.arch.data.model \
     java.runtime.name \
     vm.gc.Z \
+    vm.gc.Shenandoah \
     vm.graal.enabled \
     vm.compiler1.enabled \
     vm.compiler2.enabled \
--- old/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java	2019-05-21 15:56:07.000000000 -0700
+++ new/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionInformationEvent.java	2019-05-21 15:56:06.000000000 -0700
@@ -38,8 +38,7 @@
 /**
  * @test
  * @bug 8221507
- * @requires vm.hasJFR
- * @requires vm.gc == "Shenandoah" | vm.gc == null
+ * @requires vm.hasJFR & vm.gc.Shenandoah
  * @key jfr
  * @library /test/lib /test/jdk
  * @run main/othervm  -Xmx32m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGarbageThreshold=1 jdk.jfr.event.gc.detailed.TestShenandoahHeapRegionInformationEvent
--- old/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java	2019-05-21 15:56:08.000000000 -0700
+++ new/test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahHeapRegionStateChangeEvent.java	2019-05-21 15:56:07.000000000 -0700
@@ -37,8 +37,7 @@
 /**
  * @test
  * @bug 8221507
- * @requires vm.hasJFR
- * @requires vm.gc == "Shenandoah" | vm.gc == null
+ * @requires vm.hasJFR & vm.gc.Shenandoah
  * @key jfr
  * @library /test/lib /test/jdk
  * @run main/othervm  -Xmx32m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGarbageThreshold=1 jdk.jfr.event.gc.detailed.TestShenandoahHeapRegionStateChangeEvent