diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java
index 926f4fb407..6bcf23a6e4 100644
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java
@@ -26,6 +26,7 @@
  * @summary Clearing control during final graph reshape causes memory barrier to loose dependency on null check
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.flavor == "server"
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation
  *                   -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressLCM -XX:+StressGCM
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java b/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java
index 13d2949a29..eace48ff94 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java
@@ -26,6 +26,7 @@
  * @summary Test that loop mining arguments are sane
  * @key gc
  * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @requires vm.flavor == "server"
  * @library /test/lib
  * @run driver TestLoopMiningArguments
  */