--- old/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java	2020-07-07 16:34:32.000000000 -0700
+++ new/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java	2020-07-07 16:34:32.000000000 -0700
@@ -25,7 +25,7 @@
 /**
  * @test TestHeapDump
  * @summary Tests JVMTI heap dumps
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @compile TestHeapDump.java
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive                        TestHeapDump
  *
@@ -34,7 +34,8 @@
 /**
  * @test TestHeapDump
  * @summary Tests JVMTI heap dumps
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  * @compile TestHeapDump.java
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive -XX:-UseCompressedOops TestHeapDump
  */
@@ -42,7 +43,7 @@
 /**
  * @test TestHeapDump
  * @summary Tests JVMTI heap dumps
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  * @compile TestHeapDump.java
  * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive                         -XX:+UseStringDeduplication TestHeapDump
  */