--- old/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java	2020-07-07 16:35:31.000000000 -0700
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java	2020-07-07 16:35:31.000000000 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test TestObjectAlignment
- * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.gc.Shenandoah
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC          TestObjectAlignment
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx16m  TestObjectAlignment
@@ -38,7 +38,8 @@
 
 /*
  * @test TestObjectAlignment
- * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64")
+ * @requires vm.gc.Shenandoah
+ * @requires vm.bits == "64"
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16          TestObjectAlignment
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xmx16m  TestObjectAlignment