diff --git a/src/share/vm/runtime/globals_ext.hpp b/src/share/vm/runtime/globals_ext.hpp
index fc33227f2ccdbc996a9ca090d14b6edb424f21ca..74643c1d1e42e5835b2d775637ae9447d171bfcc 100644
--- a/src/share/vm/runtime/globals_ext.hpp
+++ b/src/share/vm/runtime/globals_ext.hpp
@@ -115,16 +115,16 @@
   product(bool, TenantDataIsolation, false,                                 \
           "Enable data isolation(e.g static vairable) per tenant")          \
                                                                             \
-  product(bool, EnableCoroutine, false,                                     \
+  experimental(bool, EnableCoroutine, false,                                \
           "Enable coroutine support")                                       \
                                                                             \
   product(uintx, DefaultCoroutineStackSize, 128*K,                          \
           "Default size of stack that is associated with new coroutine")    \
                                                                             \
-  product(bool, UseWispMonitor, false,                                      \
+  experimental(bool, UseWispMonitor, false,                                 \
           "yields to next coroutine when ObjectMonitor is contended")       \
                                                                             \
-  product(bool, UseWisp2, false,                                            \
+  experimental(bool, UseWisp2, false,                                       \
           "Enable Wisp2")                                                   \
                                                                             \
   diagnostic(bool, VerboseWisp, false,                                      \
diff --git a/test/runtime/coroutine/C1ThrowSyncExceptionTest.java b/test/runtime/coroutine/C1ThrowSyncExceptionTest.java
index afece6dff07d2e7474aae3205ec64b73357ad613..c863c8f80cf38797c7e88ee6c7cc6c9de5eb0ae9 100644
--- a/test/runtime/coroutine/C1ThrowSyncExceptionTest.java
+++ b/test/runtime/coroutine/C1ThrowSyncExceptionTest.java
@@ -23,7 +23,7 @@
  * @test
  * @summary test a special wisp unpark case for C1 compiled method
  * @requires os.family == "linux"
- * @run main/othervm  -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -XX:TieredStopAtLevel=1 C1ThrowSyncExceptionTest
+ * @run main/othervm  -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -XX:TieredStopAtLevel=1 C1ThrowSyncExceptionTest
  */
 
 
diff --git a/test/runtime/coroutine/ClassCircularityTest.java b/test/runtime/coroutine/ClassCircularityTest.java
index b04a3c08bf67a00d03bb74af3909a6cd62686d08..a4360a21af249b589176eb008d9974bf6b539359 100644
--- a/test/runtime/coroutine/ClassCircularityTest.java
+++ b/test/runtime/coroutine/ClassCircularityTest.java
@@ -24,7 +24,7 @@
  * @library /testlibrary
  * @summary test fix of parallel class-loading problem when we're using coroutine
  * @requires os.family == "linux"
- * @run main/othervm -Xmx20m -XX:+AllowParallelDefineClass -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true ClassCircularityTest
+ * @run main/othervm -Xmx20m -XX:+AllowParallelDefineClass -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true ClassCircularityTest
  */
 
 
diff --git a/test/runtime/coroutine/DirectUnparkTest.java b/test/runtime/coroutine/DirectUnparkTest.java
index 3e8514e8e40a9edf74bb8cb3d2bece26f7902635..52a0ca2835cad9368cc1a986e2a4f922082f0844 100644
--- a/test/runtime/coroutine/DirectUnparkTest.java
+++ b/test/runtime/coroutine/DirectUnparkTest.java
@@ -24,7 +24,7 @@
  * @library /testlibrary
  * @summary Test the optimization of direct unpark with Object.wait/notify
  * @requires os.family == "linux"
- * @run main/othervm  -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.enableThreadAsWisp=true -Dcom.alibaba.wisp.version=2 -Dcom.alibaba.wisp.allThreadAsWisp=true DirectUnparkTest
+ * @run main/othervm  -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.enableThreadAsWisp=true -Dcom.alibaba.wisp.version=2 -Dcom.alibaba.wisp.allThreadAsWisp=true DirectUnparkTest
 */
 
 import com.alibaba.wisp.engine.WispEngine;
diff --git a/test/runtime/coroutine/InterruptedWaitTest.java b/test/runtime/coroutine/InterruptedWaitTest.java
index 1ba158d4558df7e944d1ecbac21ec1bd738a22c6..8c876446376685b610cf3ecc449cc168af3e7976 100644
--- a/test/runtime/coroutine/InterruptedWaitTest.java
+++ b/test/runtime/coroutine/InterruptedWaitTest.java
@@ -24,7 +24,7 @@
  * @summary test obj.wait() could be interrupted
  * @requires os.family == "linux"
  * @library /testlibrary
- * @run main/othervm -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true InterruptedWaitTest
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true InterruptedWaitTest
  */
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/test/runtime/coroutine/Issue11230146.java b/test/runtime/coroutine/Issue11230146.java
index e375ab94b19b42032bd358bae2edf9510d7a0e8d..cc18a1fdf154751c42305d6f82fc2b2aa5031972 100644
--- a/test/runtime/coroutine/Issue11230146.java
+++ b/test/runtime/coroutine/Issue11230146.java
@@ -24,7 +24,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build Issue11230146
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -XX:-Inline -XX:+EnableCoroutine -Xmx10m -Xms10m -XX:ReservedCodeCacheSize=3m -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI Issue11230146
+ * @run main/othervm -XX:-Inline -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -Xmx10m -Xms10m -XX:ReservedCodeCacheSize=3m -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI Issue11230146
  * @summary Issue11230146, JTreg test for D181275
  * @requires os.family == "linux"
  */
diff --git a/test/runtime/coroutine/JStackTest.java b/test/runtime/coroutine/JStackTest.java
index b80f26d6cb49041f4b7755839acafb1fd13bd869..eee0a140fb94e45d33ff7493b8c783d97ba15026 100644
--- a/test/runtime/coroutine/JStackTest.java
+++ b/test/runtime/coroutine/JStackTest.java
@@ -24,7 +24,7 @@
  * @library /testlibrary
  * @summary Test jstack steal counter
  * @requires os.family == "linux"
- * @run main/othervm -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -XX:ActiveProcessorCount=2 JStackTest
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -XX:ActiveProcessorCount=2 JStackTest
  */
 
 import com.alibaba.wisp.engine.WispEngine;
diff --git a/test/runtime/coroutine/MemLeakTest.java b/test/runtime/coroutine/MemLeakTest.java
index c28e96d8c94124cb55b8ea12bbdd7ae0684f9b8a..e44be29be000fdbd3e28221cf3601218ec9ff751 100644
--- a/test/runtime/coroutine/MemLeakTest.java
+++ b/test/runtime/coroutine/MemLeakTest.java
@@ -23,7 +23,7 @@
  * @test
  * @summary test of memory leak while creating and destroying coroutine/thread
  * @requires os.family == "linux"
- * @run main/othervm -XX:+EnableCoroutine  -Xmx10m  -Xms10m MemLeakTest
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine  -Xmx10m  -Xms10m MemLeakTest
  */
 
 import java.dyn.Coroutine;
diff --git a/test/runtime/coroutine/MultiCoroutineStackTest.java b/test/runtime/coroutine/MultiCoroutineStackTest.java
index e7cc4c90bc9841386ff4e9452eb89381dfea27cb..f582a80606592ed5e88d7eab63e1c03f0d4c4890 100644
--- a/test/runtime/coroutine/MultiCoroutineStackTest.java
+++ b/test/runtime/coroutine/MultiCoroutineStackTest.java
@@ -24,7 +24,7 @@
  * @library /testlibrary
  * @summary Test jstack coroutine output
  * @requires os.family == "linux"
- * @run main/othervm -XX:+EnableCoroutine -Dcom.alibaba.transparentAsync=true -XX:+UseWispMonitor MultiCoroutineStackTest
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -Dcom.alibaba.transparentAsync=true -XX:+UseWispMonitor MultiCoroutineStackTest
  */
 
 import com.alibaba.wisp.engine.WispEngine;
diff --git a/test/runtime/coroutine/PreemptExceptionTest.java b/test/runtime/coroutine/PreemptExceptionTest.java
index 8f18139c100593a9d202228bed2dfc16b64de91a..aa1af475771fee07500ac4bb30f5339089557ad7 100644
--- a/test/runtime/coroutine/PreemptExceptionTest.java
+++ b/test/runtime/coroutine/PreemptExceptionTest.java
@@ -24,7 +24,7 @@
  * @library /testlibrary
  * @summary test wisp  preempt
  * @requires os.family == "linux"
- * @run main/othervm -XX:+EnableCoroutine -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.carrierEngines=1 -Dcom.alibaba.wisp.enableHandOff=true PreemptExceptionTest
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.carrierEngines=1 -Dcom.alibaba.wisp.enableHandOff=true PreemptExceptionTest
  */
 
 import java.security.MessageDigest;
diff --git a/test/runtime/coroutine/PreemptWispInternalBugTest.java b/test/runtime/coroutine/PreemptWispInternalBugTest.java
index d386ff6ce7ab702f14d3a6401ab929dce437e9b5..73843c22ac086cf2316891d72f2048f22dc52bba 100644
--- a/test/runtime/coroutine/PreemptWispInternalBugTest.java
+++ b/test/runtime/coroutine/PreemptWispInternalBugTest.java
@@ -42,6 +42,7 @@ public class PreemptWispInternalBugTest {
         if (args.length == 0) {
 	        for (int i = 0; i < tasks.length; i++) {
 		        ProcessBuilder pb = com.oracle.java.testlibrary.ProcessTools.createJavaProcessBuilder(
+		                "-XX:+UnlockExperimentalVMOptions",
 				        "-XX:+UseWisp2", "-XX:+UnlockDiagnosticVMOptions", "-XX:+VerboseWisp", "-XX:-Inline",
 				        PreemptWispInternalBugTest.class.getName(), tasks[i]);
 		        com.oracle.java.testlibrary.OutputAnalyzer output = new  com.oracle.java.testlibrary.OutputAnalyzer(pb.start());
diff --git a/test/runtime/coroutine/TestAvoidDeoptCoroutineMethod.java b/test/runtime/coroutine/TestAvoidDeoptCoroutineMethod.java
index 71e38c2e01501d0d0642168a091d0e266997e635..bc81eacd75146b647122c20eedf38c79339e2532 100644
--- a/test/runtime/coroutine/TestAvoidDeoptCoroutineMethod.java
+++ b/test/runtime/coroutine/TestAvoidDeoptCoroutineMethod.java
@@ -24,7 +24,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build TestAvoidDeoptCoroutineMethod
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -XX:+EnableCoroutine -Xmx10m -Xms10m -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestAvoidDeoptCoroutineMethod
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -Xmx10m -Xms10m -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestAvoidDeoptCoroutineMethod
  * @summary test avoid coroutine intrinsic method to be deoptimized
  * @requires os.family == "linux"
  */
diff --git a/test/runtime/coroutine/TestInvokeDynamicInterruption.java b/test/runtime/coroutine/TestInvokeDynamicInterruption.java
index db31468b0ba3bd89e6f82138a0cf7fe822645520..d90f4ea58ae0e23134e2317591d7eac094292e32 100644
--- a/test/runtime/coroutine/TestInvokeDynamicInterruption.java
+++ b/test/runtime/coroutine/TestInvokeDynamicInterruption.java
@@ -24,7 +24,7 @@
  * @summary Test invoke dynamic class for lambda with interrupt
  * @requires os.family == "linux"
  * @library /testlibrary
- * @run main/othervm -XX:+EnableCoroutine  -Dcom.alibaba.wisp.transparentWispSwitch=true -XX:+UseWispMonitor -Dcom.alibaba.wisp.enableHandOff=false -XX:+AllowParallelDefineClass TestInvokeDynamicInterruption
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine  -Dcom.alibaba.wisp.transparentWispSwitch=true -XX:+UseWispMonitor -Dcom.alibaba.wisp.enableHandOff=false -XX:+AllowParallelDefineClass TestInvokeDynamicInterruption
 */
 import com.alibaba.wisp.engine.WispEngine;
 
diff --git a/test/runtime/coroutine/TestPreserveFramePointer.java b/test/runtime/coroutine/TestPreserveFramePointer.java
index 6692b5308cd07cab3cd7dad03caebeb208312887..0654974e89eb5d8120ae197c5e0b7401da2d52b9 100644
--- a/test/runtime/coroutine/TestPreserveFramePointer.java
+++ b/test/runtime/coroutine/TestPreserveFramePointer.java
@@ -23,10 +23,10 @@
  * @test
  * @summary PreserveFramePointer for coroutine stack backtrace test
  * @requires os.family == "linux"
- * @run main/othervm -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:TieredStopAtLevel=1 -XX:+PreserveFramePointer TestPreserveFramePointer
- * @run main/othervm -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:TieredStopAtLevel=1 -XX:-PreserveFramePointer TestPreserveFramePointer
- * @run main/othervm -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:-TieredCompilation -XX:+PreserveFramePointer TestPreserveFramePointer
- * @run main/othervm -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:-TieredCompilation -XX:-PreserveFramePointer TestPreserveFramePointer
+ * @run main/othervm -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:TieredStopAtLevel=1 -XX:+PreserveFramePointer TestPreserveFramePointer
+ * @run main/othervm -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:TieredStopAtLevel=1 -XX:-PreserveFramePointer TestPreserveFramePointer
+ * @run main/othervm -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:-TieredCompilation -XX:+PreserveFramePointer TestPreserveFramePointer
+ * @run main/othervm -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true -Dcom.alibaba.wisp.version=2 -Xcomp -XX:-TieredCompilation -XX:-PreserveFramePointer TestPreserveFramePointer
  */
 
 
diff --git a/test/runtime/coroutine/Wisp2FlagCompatibilityCheckTest.java b/test/runtime/coroutine/Wisp2FlagCompatibilityCheckTest.java
index 118dcecdab5e2ac3abadb2a42b67a08e931d1eae..78ab35c33368bea05b82e28d3a2a8e66a25310d6 100644
--- a/test/runtime/coroutine/Wisp2FlagCompatibilityCheckTest.java
+++ b/test/runtime/coroutine/Wisp2FlagCompatibilityCheckTest.java
@@ -34,28 +34,36 @@ public class Wisp2FlagCompatibilityCheckTest {
         ProcessBuilder pb;
         OutputAnalyzer output;
 
-        pb = ProcessTools.createJavaProcessBuilder("-XX:+UseWisp2",
+        pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:+UseWisp2",
                 "-XX:-UseWispMonitor",
                 "-version");
         output = new OutputAnalyzer(pb.start());
         output.shouldContain("Wisp2 needs to enable -XX:+UseWispMonitor");
         System.out.println(output.getOutput());
 
-        pb = ProcessTools.createJavaProcessBuilder("-XX:+UseWisp2",
+        pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:+UseWisp2",
                 "-XX:-EnableCoroutine",
                 "-version");
         output = new OutputAnalyzer(pb.start());
         output.shouldContain("Wisp2 needs to enable -XX:+EnableCoroutine");
         System.out.println(output.getOutput());
 
-        pb = ProcessTools.createJavaProcessBuilder("-XX:+UseWisp2",
+        pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:+UseWisp2",
                 "-XX:+UseBiasedLocking",
                 "-version");
         output = new OutputAnalyzer(pb.start());
         output.shouldContain("Biased Locking is not supported with Wisp2");
         System.out.println(output.getOutput());
 
-        pb = ProcessTools.createJavaProcessBuilder("-XX:+EnableCoroutine",
+        pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:+EnableCoroutine",
                 "-XX:+UseBiasedLocking",
                 "-version");
         output = new OutputAnalyzer(pb.start());
diff --git a/test/runtime/coroutine/Wisp2SwitchTest.java b/test/runtime/coroutine/Wisp2SwitchTest.java
index af155961354a4f0065440fb3364471fde0bd80db..ccee988673d2bb4d817db7631b9c8a24f0ffe616 100644
--- a/test/runtime/coroutine/Wisp2SwitchTest.java
+++ b/test/runtime/coroutine/Wisp2SwitchTest.java
@@ -3,7 +3,7 @@
  * @summary test wisp2 switch
  * @requires os.family == "linux"
  * @library /testlibrary
- * @run main/othervm -XX:+UseWisp2  Wisp2SwitchTest
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2  Wisp2SwitchTest
  */
 
 
diff --git a/test/runtime/coroutine/Wisp2SwitchTest2.java b/test/runtime/coroutine/Wisp2SwitchTest2.java
index 4dcb251ea64827a53cb56673dba1fb9b5892b4d4..e4dcfc575e76388badb8994716c1f19b459d1cd7 100644
--- a/test/runtime/coroutine/Wisp2SwitchTest2.java
+++ b/test/runtime/coroutine/Wisp2SwitchTest2.java
@@ -24,7 +24,7 @@
  * @summary test XX:+UseWisp2 switch with -Dcom.alibaba.wisp.allThreadAsWisp=false
  * @requires os.family == "linux"
  * @library /testlibrary
- * @run main/othervm -XX:+UseWisp2 -Dcom.alibaba.wisp.allThreadAsWisp=false Wisp2SwitchTest2
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2 -Dcom.alibaba.wisp.allThreadAsWisp=false Wisp2SwitchTest2
  */
 
 
diff --git a/test/runtime/coroutine/WispClinitTest.java b/test/runtime/coroutine/WispClinitTest.java
index 4873957e5602b4d7645df1645bd4b7091429c559..98b62b262a89f939598d6a29468d45081fe5bb98 100644
--- a/test/runtime/coroutine/WispClinitTest.java
+++ b/test/runtime/coroutine/WispClinitTest.java
@@ -24,7 +24,7 @@
  * @library /testlibrary
  * @summary test clinit wait in coroutine
  * @requires os.family == "linux"
- * @run main/othervm -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true WispClinitTest
+ * @run main/othervm -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true WispClinitTest
  */
 
 
diff --git a/test/runtime/coroutine/WispEmitNewGuardTest.java b/test/runtime/coroutine/WispEmitNewGuardTest.java
index 75f1d19fd211ce7fe8847fc26f31e624e8df535b..03837ed9a4a15c2b954165f43e91f0350b397ddb 100644
--- a/test/runtime/coroutine/WispEmitNewGuardTest.java
+++ b/test/runtime/coroutine/WispEmitNewGuardTest.java
@@ -24,7 +24,7 @@
  * @library /testlibrary
  * @summary test emit_guard_for_new in C2 will add control for load
  * @requires os.family == "linux"
- * @run main/othervm -Xcomp -XX:-TieredCompilation -Xbatch -XX:CompileOnly=WispEmitNewGuardTest.testMethod -XX:+PrintCompilation -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true WispEmitNewGuardTest
+ * @run main/othervm -Xcomp -XX:-TieredCompilation -Xbatch -XX:CompileOnly=WispEmitNewGuardTest.testMethod -XX:+PrintCompilation -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.wisp.transparentWispSwitch=true WispEmitNewGuardTest
  */
 
 
diff --git a/test/runtime/coroutine/WispPreemptBugTest.java b/test/runtime/coroutine/WispPreemptBugTest.java
index 339c482f63f67f78eaaa8d322b6d2928338c0b65..1b3518d4b3a19d63d386acdcc1e39fb119c4b417 100644
--- a/test/runtime/coroutine/WispPreemptBugTest.java
+++ b/test/runtime/coroutine/WispPreemptBugTest.java
@@ -23,7 +23,7 @@
  * @test
  * @summary verify vm not crash when we're preempted frequently
  * @requires os.family == "linux"
- * @run main/othervm -XX:ActiveProcessorCount=1 -XX:+UseWisp2 WispPreemptBugTest
+ * @run main/othervm -XX:ActiveProcessorCount=1 -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2 WispPreemptBugTest
  */
 
 import java.security.MessageDigest;
diff --git a/test/runtime/coroutine/WispStealMonitorC2Test.java b/test/runtime/coroutine/WispStealMonitorC2Test.java
index 25da7bc1107c019e817b9a906fffadb06e06aedc..f5779a8279278ca2a9f95d14e0c3223aafc83ad6 100644
--- a/test/runtime/coroutine/WispStealMonitorC2Test.java
+++ b/test/runtime/coroutine/WispStealMonitorC2Test.java
@@ -23,7 +23,7 @@
  * @test
  * @summary c2 compiler monitorenter stub steal test
  * @requires os.family == "linux"
- * @run main/othervm/timeout=60 -XX:+UseWisp2 -Dcom.alibaba.wisp.schedule.stealRetry=100 -Dcom.alibaba.wisp.schedule.helpStealRetry=100 WispStealMonitorC2Test
+ * @run main/othervm/timeout=60 -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2 -Dcom.alibaba.wisp.schedule.stealRetry=100 -Dcom.alibaba.wisp.schedule.helpStealRetry=100 WispStealMonitorC2Test
  */
 
 import com.alibaba.wisp.engine.WispEngine;
diff --git a/test/runtime/coroutine/attachTest.sh b/test/runtime/coroutine/attachTest.sh
index 98e214a8e5fde4647a58c6cbed3b2fedbebc09ea..de4b3f21134d03839b49c24b34a0a8fecad89438 100644
--- a/test/runtime/coroutine/attachTest.sh
+++ b/test/runtime/coroutine/attachTest.sh
@@ -48,4 +48,4 @@ echo Agent-Class: ${AGENT} >> ${AGENT}.mf
 
 ${TESTJAVA}/bin/jar ${TESTTOOLVMOPTS} cvfm ${AGENT}.jar ${AGENT}.mf ${AGENT}*.class
 
-${TESTJAVA}/bin/java -ea -esa -XX:+UseWisp2 AttachTest &
\ No newline at end of file
+${TESTJAVA}/bin/java -ea -esa -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2 AttachTest &
\ No newline at end of file
diff --git a/test/runtime/coroutine/c1AssertFailTest.sh b/test/runtime/coroutine/c1AssertFailTest.sh
index 926663e76297d8e344e3288aa134776ec8b6edbd..316c797745d5473957038a6cb22128b07d6b9cae 100644
--- a/test/runtime/coroutine/c1AssertFailTest.sh
+++ b/test/runtime/coroutine/c1AssertFailTest.sh
@@ -28,7 +28,7 @@
 ## @run shell c1AssertFailTest.sh
 
 
-${TESTJAVA}/bin/java -Xcomp -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true &
+${TESTJAVA}/bin/java -Xcomp -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true &
 
 PID=$!
 
diff --git a/test/runtime/coroutine/coroutineBreakpointSwitchToTest.sh b/test/runtime/coroutine/coroutineBreakpointSwitchToTest.sh
index 265ddc4bbc915c00187691ceff6ab5080204f672..08ad57ff53ee9df0a3762883831d8673a098bb9e 100644
--- a/test/runtime/coroutine/coroutineBreakpointSwitchToTest.sh
+++ b/test/runtime/coroutine/coroutineBreakpointSwitchToTest.sh
@@ -62,6 +62,6 @@ gcc -DLINUX -fPIC -shared -o libtest.so \
     -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
     ${TESTSRC}/coroutineBreakpointSwitchToTest.c
 
-${JAVA} -agentpath:libtest.so -XX:-UseBiasedLocking -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -cp ${TESTCLASSES} SimpleWispTest
+${JAVA} -agentpath:libtest.so -XX:-UseBiasedLocking -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -cp ${TESTCLASSES} SimpleWispTest
 
 exit $?
diff --git a/test/runtime/coroutine/jniDetachThreadHoldingMonitorTest.c b/test/runtime/coroutine/jniDetachThreadHoldingMonitorTest.c
index 0f25a0617459acc33243eee4ec9948d13d97e76b..219377921702fcf2e121309c0c88ed150a1b5614 100644
--- a/test/runtime/coroutine/jniDetachThreadHoldingMonitorTest.c
+++ b/test/runtime/coroutine/jniDetachThreadHoldingMonitorTest.c
@@ -36,13 +36,14 @@ main()
 {
     JNIEnv *env;
     JavaVMInitArgs vm_args; /* JDK/JRE 6 VM initialization arguments */
-    JavaVMOption options[4];
-    options[0].optionString = "-XX:+EnableCoroutine";
-    options[1].optionString = "-XX:-UseBiasedLocking";
-    options[2].optionString = "-Dcom.alibaba.transparentAsync=true";
-    options[3].optionString = "-XX:+UseWispMonitor";
+    JavaVMOption options[5];
+    options[0].optionString = "-XX:+UnlockExperimentalVMOptions";
+    options[1].optionString = "-XX:+EnableCoroutine";
+    options[2].optionString = "-XX:-UseBiasedLocking";
+    options[3].optionString = "-Dcom.alibaba.transparentAsync=true";
+    options[4].optionString = "-XX:+UseWispMonitor";
     vm_args.version = JNI_VERSION_1_6;
-    vm_args.nOptions = 4;
+    vm_args.nOptions = 5;
     vm_args.options = options;
     vm_args.ignoreUnrecognized = false;
     /* load and initialize a Java VM, return a JNI interface
diff --git a/test/runtime/coroutine/jniMonitorExitTest.c b/test/runtime/coroutine/jniMonitorExitTest.c
index 4fa5b01a58951ffb902ced1425475a3e629525ae..725a995c3ef7150a85f38d44f030b7c806aa81e0 100644
--- a/test/runtime/coroutine/jniMonitorExitTest.c
+++ b/test/runtime/coroutine/jniMonitorExitTest.c
@@ -36,13 +36,14 @@ main()
 {
     JNIEnv *env;
     JavaVMInitArgs vm_args; /* JDK/JRE 6 VM initialization arguments */
-    JavaVMOption options[4];
-    options[0].optionString = "-XX:+EnableCoroutine";
-    options[1].optionString = "-XX:-UseBiasedLocking";
-    options[2].optionString = "-Dcom.alibaba.transparentAsync=true";
-    options[3].optionString = "-XX:+UseWispMonitor";
+    JavaVMOption options[5];
+    options[0].optionString = "-XX:+UnlockExperimentalVMOptions";
+    options[1].optionString = "-XX:+EnableCoroutine";
+    options[2].optionString = "-XX:-UseBiasedLocking";
+    options[3].optionString = "-Dcom.alibaba.transparentAsync=true";
+    options[4].optionString = "-XX:+UseWispMonitor";
     vm_args.version = JNI_VERSION_1_6;
-    vm_args.nOptions = 4;
+    vm_args.nOptions = 5;
     vm_args.options = options;
     vm_args.ignoreUnrecognized = false;
     /* load and initialize a Java VM, return a JNI interface
diff --git a/test/runtime/coroutine/jvmtiWispMonitorTest.sh b/test/runtime/coroutine/jvmtiWispMonitorTest.sh
index ce76673db72edea0685ab05be868fe0540177742..84d13e118c941892387024da45125422f1110898 100644
--- a/test/runtime/coroutine/jvmtiWispMonitorTest.sh
+++ b/test/runtime/coroutine/jvmtiWispMonitorTest.sh
@@ -28,7 +28,7 @@
 ## @run shell jvmtiWispMonitorTest.sh
 
 
-${TESTJAVA}/bin/java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005 -XX:+EnableCoroutine -XX:+UseWispMonitor &
+${TESTJAVA}/bin/java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005 -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor &
 
 PID=$!
 
diff --git a/test/runtime/coroutine/logCompilationTest.sh b/test/runtime/coroutine/logCompilationTest.sh
index fb3a5ec1c3d8da38d15e047a9484e5d3e99f79f0..25132141384c22c924d6ad6ecfe9b332af2a988d 100644
--- a/test/runtime/coroutine/logCompilationTest.sh
+++ b/test/runtime/coroutine/logCompilationTest.sh
@@ -50,6 +50,6 @@ esac
 
 JAVA=${TESTJAVA}${FS}bin${FS}java
 
-${JAVA} -XX:+UnlockDiagnosticVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -XX:+LogCompilation -Xcomp -cp ${TESTCLASSES} SimpleWispTest
+${JAVA} -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -XX:+UseWispMonitor -Dcom.alibaba.transparentAsync=true -XX:+LogCompilation -Xcomp -cp ${TESTCLASSES} SimpleWispTest
 
 exit $?
\ No newline at end of file
diff --git a/test/runtime/coroutine/premainWithWispMonitorTest.sh b/test/runtime/coroutine/premainWithWispMonitorTest.sh
index 42247b3c340d863707180ef91cdca65d53af36b1..6d2967c751a25839d71bc2de20b0d1b4cb497067 100644
--- a/test/runtime/coroutine/premainWithWispMonitorTest.sh
+++ b/test/runtime/coroutine/premainWithWispMonitorTest.sh
@@ -53,5 +53,5 @@ done
 
 ${TESTJAVA}/bin/jar ${TESTTOOLVMOPTS} cvfm ${AGENT}.jar ${AGENT}.mf ${AGENT}*.class
 
-${TESTJAVA}/bin/java -XX:+EnableCoroutine -Dcom.alibaba.transparentAsync=true -XX:+UseWispMonitor \
+${TESTJAVA}/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableCoroutine -Dcom.alibaba.transparentAsync=true -XX:+UseWispMonitor \
         -javaagent:PremainWithWispMonitorTest.jar PremainWithWispMonitorTest