diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index 8fe8f56e05e..dddfa3435ec 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1498,11 +1498,9 @@ JavaThreadStatus java_lang_Thread_FieldHolder::get_thread_status(oop holder) {
 
 
 int java_lang_Thread_Constants::_static_VTHREAD_GROUP_offset = 0;
-int java_lang_Thread_Constants::_static_NOT_SUPPORTED_CLASSLOADER_offset = 0;
 
 #define THREAD_CONSTANTS_STATIC_FIELDS_DO(macro) \
-  macro(_static_VTHREAD_GROUP_offset,             k, "VTHREAD_GROUP",             threadgroup_signature, true); \
-  macro(_static_NOT_SUPPORTED_CLASSLOADER_offset, k, "NOT_SUPPORTED_CLASSLOADER", classloader_signature, true);
+  macro(_static_VTHREAD_GROUP_offset,             k, "VTHREAD_GROUP",             threadgroup_signature, true);
 
 void java_lang_Thread_Constants::compute_offsets() {
   assert(_static_VTHREAD_GROUP_offset == 0, "offsets should be initialized only once");
@@ -1523,11 +1521,6 @@ oop java_lang_Thread_Constants::get_VTHREAD_GROUP() {
   return base->obj_field(_static_VTHREAD_GROUP_offset);
 }
 
-oop java_lang_Thread_Constants::get_NOT_SUPPORTED_CLASSLOADER() {
-  InstanceKlass* k = vmClasses::Thread_Constants_klass();
-  oop base = k->static_field_base_raw();
-  return base->obj_field(_static_NOT_SUPPORTED_CLASSLOADER_offset);
-}
 
 int java_lang_Thread::_holder_offset;
 int java_lang_Thread::_name_offset;
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index dd7b2b67c60..484d9ebfee1 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -475,7 +475,6 @@ class java_lang_Thread_Constants : AllStatic {
 
  public:
   static oop get_VTHREAD_GROUP();
-  static oop get_NOT_SUPPORTED_CLASSLOADER();
 
   friend class JavaClasses;
 };
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index fcb6024bac2..9588ae995f8 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -102,7 +102,7 @@
 #include "jfr/jfr.hpp"
 #endif
 
-static jint CurrentVersion = JNI_VERSION_20;
+static jint CurrentVersion = JNI_VERSION_21;
 
 #if defined(_WIN32) && !defined(USE_VECTORED_EXCEPTION_HANDLING)
 extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* );
diff --git a/src/hotspot/share/prims/jvmti.xml b/src/hotspot/share/prims/jvmti.xml
index b0c045f9322..456876fbcb9 100644
--- a/src/hotspot/share/prims/jvmti.xml
+++ b/src/hotspot/share/prims/jvmti.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml-stylesheet type="text/xsl" href="jvmti.xsl"?>
 <!--
- Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -1724,13 +1724,9 @@ jvmtiEnv *jvmti;
       </errors>
     </function>
 
-    <function id="SuspendAllVirtualThreads" num="118" since="19">
+    <function id="SuspendAllVirtualThreads" num="118" since="21">
       <synopsis>Suspend All Virtual Threads</synopsis>
       <description>
-        <b> SuspendAllVirtualThreads is a preview API of the Java platform. </b>
-        <i>Preview features may be removed in a future release, or upgraded to
-        permanent features of the Java platform.</i>
-        <p/>
         Suspend all virtual threads except those in the exception list.
         Virtual threads that are currently suspended do not change state.
         Virtual threads may be resumed with
@@ -1850,13 +1846,9 @@ jvmtiEnv *jvmti;
       </errors>
     </function>
 
-   <function id="ResumeAllVirtualThreads" num="119" since="19">
+   <function id="ResumeAllVirtualThreads" num="119" since="21">
       <synopsis>Resume All Virtual Threads</synopsis>
       <description>
-        <b> ResumeAllVirtualThreads is a preview API of the Java platform. </b>
-        <i>Preview features may be removed in a future release, or upgraded to
-        permanent features of the Java platform.</i>
-        <p/>
         Resume all virtual threads except those in the exception list.
         Virtual threads that are currently resumed do not change state.
         Virtual threads may be suspended with
@@ -10650,12 +10642,8 @@ myInit() {
           called and <eventlink id="SampledObjectAlloc"></eventlink> events can be generated.
         </description>
       </capabilityfield>
-      <capabilityfield id="can_support_virtual_threads" since="19">
+      <capabilityfield id="can_support_virtual_threads" since="21">
         <description>
-          <b> can_support_virtual_threads is a preview API of the Java platform. </b>
-          <i>Preview features may be removed in a future release, or upgraded to
-          permanent features of the Java platform.</i>
-          <p/>
           Can support virtual threads.
           If this capability is enabled then the following functions can be called:
           <functionlink id="SuspendAllVirtualThreads"></functionlink>,
@@ -13038,12 +13026,8 @@ myInit() {
   </event>
 
  <event label="Virtual Thread Start"
-         id="VirtualThreadStart" const="JVMTI_EVENT_VIRTUAL_THREAD_START" filtered="thread" num="87" phase="start" since="19">
+         id="VirtualThreadStart" const="JVMTI_EVENT_VIRTUAL_THREAD_START" filtered="thread" num="87" phase="start" since="21">
     <description>
-      <b> VirtualThreadStart is a preview API of the Java platform. </b>
-      <i>Preview features may be removed in a future release, or upgraded to
-      permanent features of the Java platform.</i>
-      <p/>
       A virtual thread start event is generated before its initial method executes.
       <p/>
       The event is sent on the newly started <paramlink id="virtual_thread"></paramlink>.
@@ -13071,12 +13055,8 @@ myInit() {
   </event>
 
   <event label="Virtual Thread End"
-         id="VirtualThreadEnd" const="JVMTI_EVENT_VIRTUAL_THREAD_END" filtered="thread" num="88" phase="start" since="19">
+         id="VirtualThreadEnd" const="JVMTI_EVENT_VIRTUAL_THREAD_END" filtered="thread" num="88" phase="start" since="21">
     <description>
-      <b> VirtualThreadEnd is a preview API of the Java platform. </b>
-      <i>Preview features may be removed in a future release, or upgraded to
-      permanent features of the Java platform.</i>
-      <p/>
       A virtual thread end event is generated after its initial method has finished execution.
       <p/>
       The event is sent on the terminating <paramlink id="virtual_thread"></paramlink>.
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 43c0d96aef3..295edf689bb 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -1311,13 +1311,6 @@ JvmtiEnv::GetThreadInfo(jthread thread, jvmtiThreadInfo* info_ptr) {
   }
 
   oop loader = java_lang_Thread::context_class_loader(thread_obj());
-  if (loader != nullptr) {
-    // Do the same as Thread.getContextClassLoader and set context_class_loader to be
-    // the system class loader when the field value is the "not supported" placeholder.
-    if (loader == java_lang_Thread_Constants::get_NOT_SUPPORTED_CLASSLOADER()) {
-      loader = SystemDictionary::java_system_loader();
-    }
-  }
   context_class_loader = Handle(current_thread, loader);
 
   { const char *n;
diff --git a/src/hotspot/share/prims/jvmtiH.xsl b/src/hotspot/share/prims/jvmtiH.xsl
index 0679c1ff3c7..8119ae6ee74 100644
--- a/src/hotspot/share/prims/jvmtiH.xsl
+++ b/src/hotspot/share/prims/jvmtiH.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -116,6 +116,7 @@ enum {
     JVMTI_VERSION_9   = 0x30090000,
     JVMTI_VERSION_11  = 0x300B0000,
     JVMTI_VERSION_19  = 0x30130000,
+    JVMTI_VERSION_21  = 0x30150000,
 
     JVMTI_VERSION = 0x30000000 + (</xsl:text>
   <xsl:value-of select="$majorversion"/>
diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
index 3bf859da8e4..3bedb0d5500 100644
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
@@ -1141,7 +1141,6 @@ void JvmtiTagMap::iterate_through_heap(jint heap_filter,
                                        const void* user_data)
 {
   // EA based optimizations on tagged objects are already reverted.
-  // disabled if vritual threads are enabled with --enable-preview
   EscapeBarrier eb(!(heap_filter & JVMTI_HEAP_FILTER_UNTAGGED), JavaThread::current());
   eb.deoptimize_objects_all_threads();
 
diff --git a/src/hotspot/share/prims/stackwalk.cpp b/src/hotspot/share/prims/stackwalk.cpp
index 47f8a25af4c..43ba7b530f6 100644
--- a/src/hotspot/share/prims/stackwalk.cpp
+++ b/src/hotspot/share/prims/stackwalk.cpp
@@ -173,6 +173,12 @@ int StackWalk::fill_in_frames(jlong mode, BaseFrameStream& stream,
 
   int frames_decoded = 0;
   for (; !stream.at_end(); stream.next()) {
+    if (stream.continuation() != nullptr && stream.continuation() != stream.reg_map()->cont()) {
+      // The code in StackStreamFactory.java has failed to set the continuation because frameBuffer.isAtBottom()
+      // returns false if the end of a continuation falls precisely at the end of the batch.
+      // By breaking here, we're signalling the Java code to set the continuation to the parent.
+      break;
+    }
     assert(stream.continuation() == nullptr || stream.continuation() == stream.reg_map()->cont(), "");
     Method* method = stream.method();
 
@@ -190,6 +196,8 @@ int StackWalk::fill_in_frames(jlong mode, BaseFrameStream& stream,
           method->print_short_name(&ls);
           ls.cr();
         }
+        // We end a batch on continuation bottom to let the Java side skip top frames of the next one
+        if (stream.continuation() != nullptr && method->intrinsic_id() == vmIntrinsics::_Continuation_enter) break;
         continue;
       }
     }
@@ -576,7 +584,7 @@ jint StackWalk::fetchNextBatch(Handle stackStream, jlong mode, jlong magic,
     if (!stream.at_end()) {
       int n = fill_in_frames(mode, stream, frame_count, start_index,
                              frames_array, end_index, CHECK_0);
-      if (n < 1) {
+      if (n < 1 && !skip_hidden_frames(mode)) {
         THROW_MSG_(vmSymbols::java_lang_InternalError(), "doStackWalk: later decode failed", 0L);
       }
       return end_index;
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 7384c125daf..47816206ed0 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -1159,6 +1159,7 @@ jboolean Threads::is_supported_jni_version(jint version) {
   if (version == JNI_VERSION_10) return JNI_TRUE;
   if (version == JNI_VERSION_19) return JNI_TRUE;
   if (version == JNI_VERSION_20) return JNI_TRUE;
+  if (version == JNI_VERSION_21) return JNI_TRUE;
   return JNI_FALSE;
 }
 
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 33043e519bf..f15b5861670 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -89,7 +89,6 @@ import jdk.internal.vm.ThreadContainer;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
-import jdk.internal.vm.annotation.ChangesCurrentThread;
 import sun.nio.fs.DefaultFileSystemProvider;
 import sun.reflect.annotation.AnnotationType;
 import sun.nio.ch.Interruptible;
@@ -2567,17 +2566,9 @@ public final class System {
                 return Thread.currentCarrierThread();
             }
 
-            @ChangesCurrentThread
             public <V> V executeOnCarrierThread(Callable<V> task) throws Exception {
-                Thread thread = Thread.currentThread();
-                if (thread.isVirtual()) {
-                    Thread carrier = Thread.currentCarrierThread();
-                    carrier.setCurrentThread(carrier);
-                    try {
-                        return task.call();
-                    } finally {
-                        carrier.setCurrentThread(thread);
-                    }
+                if (Thread.currentThread() instanceof VirtualThread vthread) {
+                    return vthread.executeOnCarrierThread(task);
                 } else {
                     return task.call();
                 }
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 0c1380d553f..5e30698ae43 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -38,11 +38,7 @@ import java.util.HashMap;
 import java.util.Objects;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.locks.LockSupport;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
 import jdk.internal.event.ThreadSleepEvent;
-import jdk.internal.javac.PreviewFeature;
-import jdk.internal.misc.PreviewFeatures;
 import jdk.internal.misc.StructureViolationExceptions;
 import jdk.internal.misc.TerminatingThreadLocal;
 import jdk.internal.misc.Unsafe;
@@ -56,6 +52,7 @@ import jdk.internal.vm.ThreadContainer;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Hidden;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
+import jdk.internal.vm.annotation.Stable;
 import sun.nio.ch.Interruptible;
 import sun.security.util.SecurityConstants;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -84,11 +81,11 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
  *
  * <p> Threads support {@link ThreadLocal} variables. These are variables that are
  * local to a thread, meaning a thread can have a copy of a variable that is set to
- * a value that is independent of the value set by other threads. Thread also supports
- * {@link InheritableThreadLocal} variables that are thread local variables that are
- * inherited at Thread creation time from the parent Thread. Thread supports a special
- * inheritable thread local for the thread {@linkplain #getContextClassLoader()
- * context-class-loader}.
+ * a value that is independent of the value set by other threads. {@code Thread} also
+ * supports {@link InheritableThreadLocal} variables that are thread local variables
+ * that are inherited at thread creation time from the parent {@code Thread}.
+ * {@code Thread} supports a special inheritable thread local for the thread
+ * {@linkplain #getContextClassLoader() context-class-loader}.
  *
  * <h2><a id="platform-threads">Platform threads</a></h2>
  * <p> {@code Thread} supports the creation of <i>platform threads</i> that are
@@ -279,7 +276,8 @@ public class Thread implements Runnable {
 
     /*
      * ThreadLocal values pertaining to this thread. This map is maintained
-     * by the ThreadLocal class. */
+     * by the ThreadLocal class.
+     */
     ThreadLocal.ThreadLocalMap threadLocals;
 
     /*
@@ -450,6 +448,36 @@ public class Thread implements Runnable {
 
     private static native void yield0();
 
+    /**
+     * Called before sleeping to create a jdk.ThreadSleep event.
+     */
+    private static ThreadSleepEvent beforeSleep(long nanos) {
+        ThreadSleepEvent event = null;
+        if (ThreadSleepEvent.isTurnedOn()) {
+            try {
+                event = new ThreadSleepEvent();
+                event.time = nanos;
+                event.begin();
+            } catch (OutOfMemoryError e) {
+                event = null;
+            }
+        }
+        return event;
+    }
+
+    /**
+     * Called after sleeping to commit the jdk.ThreadSleep event.
+     */
+    private static void afterSleep(ThreadSleepEvent event) {
+        if (event != null) {
+            try {
+                event.commit();
+            } catch (OutOfMemoryError e) {
+                // ignore
+            }
+        }
+    }
+
     /**
      * Causes the currently executing thread to sleep (temporarily cease
      * execution) for the specified number of milliseconds, subject to
@@ -472,23 +500,16 @@ public class Thread implements Runnable {
             throw new IllegalArgumentException("timeout value is negative");
         }
 
-        if (currentThread() instanceof VirtualThread vthread) {
-            long nanos = MILLISECONDS.toNanos(millis);
-            vthread.sleepNanos(nanos);
-            return;
-        }
-
-        if (ThreadSleepEvent.isTurnedOn()) {
-            ThreadSleepEvent event = new ThreadSleepEvent();
-            try {
-                event.time = MILLISECONDS.toNanos(millis);
-                event.begin();
+        long nanos = MILLISECONDS.toNanos(millis);
+        ThreadSleepEvent event = beforeSleep(nanos);
+        try {
+            if (currentThread() instanceof VirtualThread vthread) {
+                vthread.sleepNanos(nanos);
+            } else {
                 sleep0(millis);
-            } finally {
-                event.commit();
             }
-        } else {
-            sleep0(millis);
+        } finally {
+            afterSleep(event);
         }
     }
 
@@ -525,18 +546,24 @@ public class Thread implements Runnable {
             throw new IllegalArgumentException("nanosecond timeout value out of range");
         }
 
-        if (currentThread() instanceof VirtualThread vthread) {
-            // total sleep time, in nanoseconds
-            long totalNanos = MILLISECONDS.toNanos(millis);
-            totalNanos += Math.min(Long.MAX_VALUE - totalNanos, nanos);
-            vthread.sleepNanos(totalNanos);
-            return;
-        }
+        // total sleep time, in nanoseconds
+        long totalNanos = MILLISECONDS.toNanos(millis);
+        totalNanos += Math.min(Long.MAX_VALUE - totalNanos, nanos);
 
-        if (nanos > 0 && millis < Long.MAX_VALUE) {
-            millis++;
+        ThreadSleepEvent event = beforeSleep(totalNanos);
+        try {
+            if (currentThread() instanceof VirtualThread vthread) {
+                vthread.sleepNanos(totalNanos);
+            } else {
+                // millisecond precision
+                if (nanos > 0 && millis < Long.MAX_VALUE) {
+                    millis++;
+                }
+                sleep0(millis);
+            }
+        } finally {
+            afterSleep(event);
         }
-        sleep(millis);
     }
 
     /**
@@ -557,20 +584,25 @@ public class Thread implements Runnable {
      */
     public static void sleep(Duration duration) throws InterruptedException {
         long nanos = NANOSECONDS.convert(duration);  // MAX_VALUE if > 292 years
-        if (nanos < 0)
-            return;
-
-        if (currentThread() instanceof VirtualThread vthread) {
-            vthread.sleepNanos(nanos);
+        if (nanos < 0) {
             return;
         }
 
-        // convert to milliseconds
-        long millis = MILLISECONDS.convert(nanos, NANOSECONDS);
-        if (nanos > NANOSECONDS.convert(millis, MILLISECONDS)) {
-            millis += 1L;
+        ThreadSleepEvent event = beforeSleep(nanos);
+        try {
+            if (currentThread() instanceof VirtualThread vthread) {
+                vthread.sleepNanos(nanos);
+            } else {
+                // millisecond precision
+                long millis = NANOSECONDS.toMillis(nanos);
+                if (nanos > MILLISECONDS.toNanos(millis)) {
+                    millis += 1L;
+                }
+                sleep0(millis);
+            }
+        } finally {
+            afterSleep(event);
         }
-        sleep(millis);
     }
 
     /**
@@ -612,13 +644,6 @@ public class Thread implements Runnable {
     @IntrinsicCandidate
     public static void onSpinWait() {}
 
-    /**
-     * Characteristic value signifying that the thread cannot set values for its
-     * copy of {@link ThreadLocal thread-locals}.
-     * See Thread initialization.
-     */
-    static final int NO_THREAD_LOCALS = 1 << 1;
-
     /**
      * Characteristic value signifying that initial values for {@link
      * InheritableThreadLocal inheritable-thread-locals} are not inherited from
@@ -658,8 +683,7 @@ public class Thread implements Runnable {
             return parent.getContextClassLoader();
         } else {
             // skip call to getContextClassLoader
-            ClassLoader cl = parent.contextClassLoader;
-            return (isSupportedClassLoader(cl)) ? cl : ClassLoader.getSystemClassLoader();
+            return parent.contextClassLoader;
         }
     }
 
@@ -728,23 +752,13 @@ public class Thread implements Runnable {
 
         // thread locals
         if (!attached) {
-            if ((characteristics & NO_THREAD_LOCALS) != 0) {
-                this.threadLocals = ThreadLocal.ThreadLocalMap.NOT_SUPPORTED;
-                this.inheritableThreadLocals = ThreadLocal.ThreadLocalMap.NOT_SUPPORTED;
-                this.contextClassLoader = Constants.NOT_SUPPORTED_CLASSLOADER;
-            } else if ((characteristics & NO_INHERIT_THREAD_LOCALS) == 0) {
+            if ((characteristics & NO_INHERIT_THREAD_LOCALS) == 0) {
                 ThreadLocal.ThreadLocalMap parentMap = parent.inheritableThreadLocals;
-                if (parentMap != null
-                        && parentMap != ThreadLocal.ThreadLocalMap.NOT_SUPPORTED
-                        && parentMap.size() > 0) {
+                if (parentMap != null && parentMap.size() > 0) {
                     this.inheritableThreadLocals = ThreadLocal.createInheritedMap(parentMap);
                 }
-                ClassLoader parentLoader = contextClassLoader(parent);
-                if (VM.isBooted() && !isSupportedClassLoader(parentLoader)) {
-                    // parent does not support thread locals so no CCL to inherit
-                    this.contextClassLoader = ClassLoader.getSystemClassLoader();
-                } else {
-                    this.contextClassLoader = parentLoader;
+                if (VM.isBooted()) {
+                    this.contextClassLoader = contextClassLoader(parent);
                 }
             } else if (VM.isBooted()) {
                 // default CCL to the system class loader when not inheriting
@@ -752,7 +766,7 @@ public class Thread implements Runnable {
             }
         }
 
-        // Special value to indicate this is a newly-created Thread
+        // special value to indicate this is a newly-created Thread
         // Note that his must match the declaration in ScopedValue.
         this.scopedValueBindings = NEW_THREAD_BINDINGS;
     }
@@ -770,31 +784,19 @@ public class Thread implements Runnable {
         this.inheritedAccessControlContext = Constants.NO_PERMISSIONS_ACC;
 
         // thread locals
-        if ((characteristics & NO_THREAD_LOCALS) != 0) {
-            this.threadLocals = ThreadLocal.ThreadLocalMap.NOT_SUPPORTED;
-            this.inheritableThreadLocals = ThreadLocal.ThreadLocalMap.NOT_SUPPORTED;
-            this.contextClassLoader = Constants.NOT_SUPPORTED_CLASSLOADER;
-        } else if ((characteristics & NO_INHERIT_THREAD_LOCALS) == 0) {
+        if ((characteristics & NO_INHERIT_THREAD_LOCALS) == 0) {
             Thread parent = currentThread();
             ThreadLocal.ThreadLocalMap parentMap = parent.inheritableThreadLocals;
-            if (parentMap != null
-                    && parentMap != ThreadLocal.ThreadLocalMap.NOT_SUPPORTED
-                    && parentMap.size() > 0) {
+            if (parentMap != null && parentMap.size() > 0) {
                 this.inheritableThreadLocals = ThreadLocal.createInheritedMap(parentMap);
             }
-            ClassLoader parentLoader = contextClassLoader(parent);
-            if (isSupportedClassLoader(parentLoader)) {
-                this.contextClassLoader = parentLoader;
-            } else {
-                // parent does not support thread locals so no CCL to inherit
-                this.contextClassLoader = ClassLoader.getSystemClassLoader();
-            }
+            this.contextClassLoader = contextClassLoader(parent);
         } else {
             // default CCL to the system class loader when not inheriting
             this.contextClassLoader = ClassLoader.getSystemClassLoader();
         }
 
-        // Special value to indicate this is a newly-created Thread
+        // special value to indicate this is a newly-created Thread
         this.scopedValueBindings = NEW_THREAD_BINDINGS;
 
         // create a FieldHolder object, needed when bound to an OS thread
@@ -837,9 +839,8 @@ public class Thread implements Runnable {
      * }
      *
      * @return A builder for creating {@code Thread} or {@code ThreadFactory} objects.
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
     public static Builder.OfPlatform ofPlatform() {
         return new ThreadBuilders.PlatformThreadBuilder();
     }
@@ -858,12 +859,9 @@ public class Thread implements Runnable {
      * }
      *
      * @return A builder for creating {@code Thread} or {@code ThreadFactory} objects.
-     * @throws UnsupportedOperationException if preview features are not enabled
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
     public static Builder.OfVirtual ofVirtual() {
-        PreviewFeatures.ensureEnabled();
         return new ThreadBuilders.VirtualThreadBuilder();
     }
 
@@ -893,14 +891,10 @@ public class Thread implements Runnable {
      *
      * @see Thread#ofPlatform()
      * @see Thread#ofVirtual()
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
     public sealed interface Builder
-            permits Builder.OfPlatform,
-                    Builder.OfVirtual,
-                    ThreadBuilders.BaseThreadBuilder {
-
+            permits Builder.OfPlatform, Builder.OfVirtual {
 
         /**
          * Sets the thread name.
@@ -936,37 +930,11 @@ public class Thread implements Runnable {
          */
         Builder name(String prefix, long start);
 
-        /**
-         * Sets whether the thread is allowed to set values for its copy of {@linkplain
-         * ThreadLocal thread-local} variables. The default is to allow. If not allowed,
-         * then any attempt by the thread to set a value for a thread-local with the
-         * {@link ThreadLocal#set(Object)} method throws {@code
-         * UnsupportedOperationException}. Any attempt to set the thread's context
-         * class loader with {@link Thread#setContextClassLoader(ClassLoader)
-         * setContextClassLoader} also throws. The {@link ThreadLocal#get()} method
-         * always returns the {@linkplain ThreadLocal#initialValue() initial-value}
-         * when thread locals are not allowed.
-         *
-         * @apiNote This method is intended for cases where there are a large number of
-         * threads and where potentially unbounded memory usage due to thread locals is
-         * a concern. Disallowing a thread to set its copy of thread-local variables
-         * creates the potential for exceptions at run-time so great care is required
-         * when the thread is used to invoke arbitrary code.
-         *
-         * @param allow {@code true} to allow, {@code false} to disallow
-         * @return this builder
-         */
-        Builder allowSetThreadLocals(boolean allow);
-
         /**
          * Sets whether the thread inherits the initial values of {@linkplain
          * InheritableThreadLocal inheritable-thread-local} variables from the
          * constructing thread. The default is to inherit.
          *
-         * <p> The initial values of {@code InheritableThreadLocal}s are never inherited
-         * when {@link #allowSetThreadLocals(boolean)} is used to disallow the thread
-         * to have its own copy of thread-local variables.
-         *
          * @param inherit {@code true} to inherit, {@code false} to not inherit
          * @return this builder
          */
@@ -1025,9 +993,8 @@ public class Thread implements Runnable {
          * this interface causes a {@code NullPointerException} to be thrown.
          *
          * @see Thread#ofPlatform()
-         * @since 19
+         * @since 21
          */
-        @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
         sealed interface OfPlatform extends Builder
                 permits ThreadBuilders.PlatformThreadBuilder {
 
@@ -1038,7 +1005,6 @@ public class Thread implements Runnable {
              */
             @Override OfPlatform name(String prefix, long start);
 
-            @Override OfPlatform allowSetThreadLocals(boolean allow);
             @Override OfPlatform inheritInheritableThreadLocals(boolean inherit);
             @Override OfPlatform uncaughtExceptionHandler(UncaughtExceptionHandler ueh);
 
@@ -1101,9 +1067,8 @@ public class Thread implements Runnable {
          * this interface causes a {@code NullPointerException} to be thrown.
          *
          * @see Thread#ofVirtual()
-         * @since 19
+         * @since 21
          */
-        @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
         sealed interface OfVirtual extends Builder
                 permits ThreadBuilders.VirtualThreadBuilder {
 
@@ -1114,7 +1079,6 @@ public class Thread implements Runnable {
              */
             @Override OfVirtual name(String prefix, long start);
 
-            @Override OfVirtual allowSetThreadLocals(boolean allow);
             @Override OfVirtual inheritInheritableThreadLocals(boolean inherit);
             @Override OfVirtual uncaughtExceptionHandler(UncaughtExceptionHandler ueh);
         }
@@ -1532,14 +1496,11 @@ public class Thread implements Runnable {
      *
      * @param task the object to run when the thread executes
      * @return a new, and started, virtual thread
-     * @throws UnsupportedOperationException if preview features are not enabled
      * @see <a href="#inheritance">Inheritance when creating threads</a>
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
     public static Thread startVirtualThread(Runnable task) {
         Objects.requireNonNull(task);
-        PreviewFeatures.ensureEnabled();
         var thread = ThreadBuilders.newVirtualThread(null, null, 0, task);
         thread.start();
         return thread;
@@ -1551,9 +1512,8 @@ public class Thread implements Runnable {
      *
      * @return {@code true} if this thread is a virtual thread
      *
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
     public final boolean isVirtual() {
         return (this instanceof BaseVirtualThread);
     }
@@ -1588,6 +1548,8 @@ public class Thread implements Runnable {
                 throw new IllegalThreadStateException();
 
             // bind thread to container
+            if (this.container != null)
+                throw new IllegalThreadStateException();
             setThreadContainer(container);
 
             // start thread
@@ -1662,15 +1624,17 @@ public class Thread implements Runnable {
      * a chance to clean up before it actually exits.
      */
     private void exit() {
-        // pop any remaining scopes from the stack, this may block
-        if (headStackableScopes != null) {
-            StackableScope.popAll();
-        }
-
-        // notify container that thread is exiting
-        ThreadContainer container = threadContainer();
-        if (container != null) {
-            container.onExit(this);
+        try {
+            // pop any remaining scopes from the stack, this may block
+            if (headStackableScopes != null) {
+                StackableScope.popAll();
+            }
+        } finally {
+            // notify container that thread is exiting
+            ThreadContainer container = threadContainer();
+            if (container != null) {
+                container.onExit(this);
+            }
         }
 
         try {
@@ -2383,8 +2347,6 @@ public class Thread implements Runnable {
         ClassLoader cl = this.contextClassLoader;
         if (cl == null)
             return null;
-        if (!isSupportedClassLoader(cl))
-            cl = ClassLoader.getSystemClassLoader();
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -2400,10 +2362,6 @@ public class Thread implements Runnable {
      * <p> The context {@code ClassLoader} may be set by the creator of the thread
      * for use by code running in this thread when loading classes and resources.
      *
-     * <p> The context {@code ClassLoader} cannot be set when the thread is
-     * {@linkplain Thread.Builder#allowSetThreadLocals(boolean) not allowed} to have
-     * its own copy of thread local variables.
-     *
      * <p> If a security manager is present, its {@link
      * SecurityManager#checkPermission(java.security.Permission) checkPermission}
      * method is invoked with a {@link RuntimePermission RuntimePermission}{@code
@@ -2414,9 +2372,6 @@ public class Thread implements Runnable {
      *         the context ClassLoader for this Thread, or null  indicating the
      *         system class loader (or, failing that, the bootstrap class loader)
      *
-     * @throws  UnsupportedOperationException if this thread is not allowed
-     *          to set values for its copy of thread-local variables
-     *
      * @throws  SecurityException
      *          if the current thread cannot set the context ClassLoader
      *
@@ -2428,27 +2383,9 @@ public class Thread implements Runnable {
         if (sm != null) {
             sm.checkPermission(new RuntimePermission("setContextClassLoader"));
         }
-        if (!isSupportedClassLoader(contextClassLoader)) {
-            throw new UnsupportedOperationException(
-                "The context class loader cannot be set");
-        }
         contextClassLoader = cl;
     }
 
-    /**
-     * Returns true if the given ClassLoader is a "supported" class loader. All
-     * class loaders, except ClassLoaders.NOT_SUPPORTED, are considered supported.
-     * This method allows the initialization of ClassLoaders to be delayed until
-     * it is required.
-     */
-    private static boolean isSupportedClassLoader(ClassLoader loader) {
-        if (loader == null)
-            return true;
-        if (loader == jdk.internal.loader.ClassLoaders.appClassLoader())
-            return true;
-        return loader != Constants.NOT_SUPPORTED_CLASSLOADER;
-    }
-
     /**
      * Returns {@code true} if and only if the current thread holds the
      * monitor lock on the specified object.
@@ -2985,9 +2922,6 @@ public class Thread implements Runnable {
         @SuppressWarnings("removal")
         static final AccessControlContext NO_PERMISSIONS_ACC;
 
-        // Placeholder TCCL when thread locals not supported
-        static final ClassLoader NOT_SUPPORTED_CLASSLOADER;
-
         static {
             var getThreadGroup  = new PrivilegedAction<ThreadGroup>() {
                 @Override
@@ -3005,16 +2939,6 @@ public class Thread implements Runnable {
             NO_PERMISSIONS_ACC = new AccessControlContext(new ProtectionDomain[] {
                 new ProtectionDomain(null, null)
             });
-
-            var createClassLoader = new PrivilegedAction<ClassLoader>() {
-                @Override
-                public ClassLoader run() {
-                    return new ClassLoader(null) { };
-                }
-            };
-            @SuppressWarnings("removal")
-            ClassLoader loader = AccessController.doPrivileged(createClassLoader);
-            NOT_SUPPORTED_CLASSLOADER = loader;
         }
     }
 
@@ -3040,7 +2964,7 @@ public class Thread implements Runnable {
     int threadLocalRandomSecondarySeed;
 
     /** The thread container that this thread is in */
-    private volatile ThreadContainer container;  // @Stable candidate?
+    private @Stable ThreadContainer container;
     ThreadContainer threadContainer() {
         return container;
     }
diff --git a/src/java.base/share/classes/java/lang/ThreadBuilders.java b/src/java.base/share/classes/java/lang/ThreadBuilders.java
index 6d7b90b50ae..c75548d2c36 100644
--- a/src/java.base/share/classes/java/lang/ThreadBuilders.java
+++ b/src/java.base/share/classes/java/lang/ThreadBuilders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
  */
 package java.lang;
 
-import java.lang.Thread.Builder;
 import java.lang.Thread.Builder.OfPlatform;
 import java.lang.Thread.Builder.OfVirtual;
 import java.lang.Thread.UncaughtExceptionHandler;
@@ -41,12 +40,12 @@ import jdk.internal.vm.ContinuationSupport;
  * Defines static methods to create platform and virtual thread builders.
  */
 class ThreadBuilders {
+    private ThreadBuilders() { }
 
     /**
-     * Base implementation of ThreadBuilder.
+     * Base class for Thread.Builder implementations.
      */
-    static abstract non-sealed
-    class BaseThreadBuilder<T extends Builder> implements Builder {
+    private static class BaseThreadBuilder {
         private String name;
         private long counter;
         private int characteristics;
@@ -76,52 +75,29 @@ class ThreadBuilders {
             }
         }
 
-        @Override
-        @SuppressWarnings("unchecked")
-        public T name(String name) {
+        void setName(String name) {
             this.name = Objects.requireNonNull(name);
             this.counter = -1;
-            return (T) this;
         }
 
-        @Override
-        @SuppressWarnings("unchecked")
-        public T name(String prefix, long start) {
+        void setName(String prefix, long start) {
             Objects.requireNonNull(prefix);
             if (start < 0)
                 throw new IllegalArgumentException("'start' is negative");
             this.name = prefix;
             this.counter = start;
-            return (T) this;
         }
 
-        @Override
-        @SuppressWarnings("unchecked")
-        public T allowSetThreadLocals(boolean allow) {
-            if (allow) {
-                characteristics &= ~Thread.NO_THREAD_LOCALS;
-            } else {
-                characteristics |= Thread.NO_THREAD_LOCALS;
-            }
-            return (T) this;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public T inheritInheritableThreadLocals(boolean inherit) {
+        void setInheritInheritableThreadLocals(boolean inherit) {
             if (inherit) {
                 characteristics &= ~Thread.NO_INHERIT_THREAD_LOCALS;
             } else {
                 characteristics |= Thread.NO_INHERIT_THREAD_LOCALS;
             }
-            return (T) this;
         }
 
-        @Override
-        @SuppressWarnings("unchecked")
-        public T uncaughtExceptionHandler(UncaughtExceptionHandler ueh) {
+        void setUncaughtExceptionHandler(UncaughtExceptionHandler ueh) {
             this.uhe = Objects.requireNonNull(ueh);
-            return (T) this;
         }
     }
 
@@ -129,7 +105,7 @@ class ThreadBuilders {
      * ThreadBuilder.OfPlatform implementation.
      */
     static final class PlatformThreadBuilder
-            extends BaseThreadBuilder<OfPlatform> implements OfPlatform {
+            extends BaseThreadBuilder implements OfPlatform {
         private ThreadGroup group;
         private boolean daemon;
         private boolean daemonChanged;
@@ -145,6 +121,30 @@ class ThreadBuilders {
             return (name != null) ? name : Thread.genThreadName();
         }
 
+        @Override
+        public OfPlatform name(String name) {
+            setName(name);
+            return this;
+        }
+
+        @Override
+        public OfPlatform name(String prefix, long start) {
+            setName(prefix, start);
+            return this;
+        }
+
+        @Override
+        public OfPlatform inheritInheritableThreadLocals(boolean inherit) {
+            setInheritInheritableThreadLocals(inherit);
+            return this;
+        }
+
+        @Override
+        public OfPlatform uncaughtExceptionHandler(UncaughtExceptionHandler ueh) {
+            setUncaughtExceptionHandler(ueh);
+            return this;
+        }
+
         @Override
         public OfPlatform group(ThreadGroup group) {
             this.group = Objects.requireNonNull(group);
@@ -208,7 +208,7 @@ class ThreadBuilders {
      * ThreadBuilder.OfVirtual implementation.
      */
     static final class VirtualThreadBuilder
-            extends BaseThreadBuilder<OfVirtual> implements OfVirtual {
+            extends BaseThreadBuilder implements OfVirtual {
         private Executor scheduler;
 
         VirtualThreadBuilder() {
@@ -221,6 +221,30 @@ class ThreadBuilders {
             this.scheduler = Objects.requireNonNull(scheduler);
         }
 
+        @Override
+        public OfVirtual name(String name) {
+            setName(name);
+            return this;
+        }
+
+        @Override
+        public OfVirtual name(String prefix, long start) {
+            setName(prefix, start);
+            return this;
+        }
+
+        @Override
+        public OfVirtual inheritInheritableThreadLocals(boolean inherit) {
+            setInheritInheritableThreadLocals(inherit);
+            return this;
+        }
+
+        @Override
+        public OfVirtual uncaughtExceptionHandler(UncaughtExceptionHandler ueh) {
+            setUncaughtExceptionHandler(ueh);
+            return this;
+        }
+
         @Override
         public Thread unstarted(Runnable task) {
             Objects.requireNonNull(task);
diff --git a/src/java.base/share/classes/java/lang/ThreadLocal.java b/src/java.base/share/classes/java/lang/ThreadLocal.java
index 68c6dc49533..ceb1d3ff811 100644
--- a/src/java.base/share/classes/java/lang/ThreadLocal.java
+++ b/src/java.base/share/classes/java/lang/ThreadLocal.java
@@ -29,9 +29,11 @@ import java.lang.ref.WeakReference;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import jdk.internal.misc.CarrierThreadLocal;
 import jdk.internal.misc.TerminatingThreadLocal;
+import sun.security.action.GetPropertyAction;
 
 /**
  * This class provides thread-local variables.  These variables differ from
@@ -77,6 +79,8 @@ import jdk.internal.misc.TerminatingThreadLocal;
  * @since   1.2
  */
 public class ThreadLocal<T> {
+    private static final boolean TRACE_VTHREAD_LOCALS = traceVirtualThreadLocals();
+
     /**
      * ThreadLocals rely on per-thread linear-probe hash maps attached
      * to each thread (Thread.threadLocals and
@@ -161,11 +165,8 @@ public class ThreadLocal<T> {
      * thread-local variable.  If the variable has no value for the
      * current thread, it is first initialized to the value returned
      * by an invocation of the {@link #initialValue} method.
-     * If the current thread does not support thread locals then
-     * this method returns its {@link #initialValue}.
      *
      * @return the current thread's value of this thread-local
-     * @see Thread.Builder#allowSetThreadLocals(boolean)
      */
     public T get() {
         return get(Thread.currentThread());
@@ -183,15 +184,11 @@ public class ThreadLocal<T> {
     private T get(Thread t) {
         ThreadLocalMap map = getMap(t);
         if (map != null) {
-            if (map == ThreadLocalMap.NOT_SUPPORTED) {
-                return initialValue();
-            } else {
-                ThreadLocalMap.Entry e = map.getEntry(this);
-                if (e != null) {
-                    @SuppressWarnings("unchecked")
-                    T result = (T) e.value;
-                    return result;
-                }
+            ThreadLocalMap.Entry e = map.getEntry(this);
+            if (e != null) {
+                @SuppressWarnings("unchecked")
+                T result = (T) e.value;
+                return result;
             }
         }
         return setInitialValue(t);
@@ -211,7 +208,7 @@ public class ThreadLocal<T> {
 
     private boolean isPresent(Thread t) {
         ThreadLocalMap map = getMap(t);
-        if (map != null && map != ThreadLocalMap.NOT_SUPPORTED) {
+        if (map != null) {
             return map.getEntry(this) != null;
         } else {
             return false;
@@ -227,7 +224,6 @@ public class ThreadLocal<T> {
     private T setInitialValue(Thread t) {
         T value = initialValue();
         ThreadLocalMap map = getMap(t);
-        assert map != ThreadLocalMap.NOT_SUPPORTED;
         if (map != null) {
             map.set(this, value);
         } else {
@@ -236,6 +232,9 @@ public class ThreadLocal<T> {
         if (this instanceof TerminatingThreadLocal<?> ttl) {
             TerminatingThreadLocal.register(ttl);
         }
+        if (TRACE_VTHREAD_LOCALS) {
+            dumpStackIfVirtualThread();
+        }
         return value;
     }
 
@@ -247,14 +246,12 @@ public class ThreadLocal<T> {
      *
      * @param value the value to be stored in the current thread's copy of
      *        this thread-local.
-     *
-     * @throws UnsupportedOperationException if the current thread is not
-     *         allowed to set its copy of thread-local variables
-     *
-     * @see Thread.Builder#allowSetThreadLocals(boolean)
      */
     public void set(T value) {
         set(Thread.currentThread(), value);
+        if (TRACE_VTHREAD_LOCALS) {
+            dumpStackIfVirtualThread();
+        }
     }
 
     void setCarrierThreadLocal(T value) {
@@ -264,9 +261,6 @@ public class ThreadLocal<T> {
 
     private void set(Thread t, T value) {
         ThreadLocalMap map = getMap(t);
-        if (map == ThreadLocalMap.NOT_SUPPORTED) {
-            throw new UnsupportedOperationException();
-        }
         if (map != null) {
             map.set(this, value);
         } else {
@@ -296,7 +290,7 @@ public class ThreadLocal<T> {
 
      private void remove(Thread t) {
          ThreadLocalMap m = getMap(t);
-         if (m != null && m != ThreadLocalMap.NOT_SUPPORTED) {
+         if (m != null) {
              m.remove(this);
          }
      }
@@ -394,9 +388,6 @@ public class ThreadLocal<T> {
             }
         }
 
-        // Placeholder when thread locals not supported
-        static final ThreadLocalMap NOT_SUPPORTED = new ThreadLocalMap();
-
         /**
          * The initial capacity -- MUST be a power of two.
          */
@@ -807,4 +798,43 @@ public class ThreadLocal<T> {
             }
         }
     }
+
+
+    /**
+     * Reads the value of the jdk.traceVirtualThreadLocals property to determine if
+     * a stack trace should be printed when a virtual thread sets a thread local.
+     */
+    private static boolean traceVirtualThreadLocals() {
+        String propValue = GetPropertyAction.privilegedGetProperty("jdk.traceVirtualThreadLocals");
+        return (propValue != null)
+                && (propValue.isEmpty() || Boolean.parseBoolean(propValue));
+    }
+
+    /**
+     * Print a stack trace if the current thread is a virtual thread.
+     */
+    static void dumpStackIfVirtualThread() {
+        if (Thread.currentThread() instanceof VirtualThread vthread) {
+            try {
+                var stack = StackWalkerHolder.STACK_WALKER.walk(s ->
+                        s.skip(1)  // skip caller
+                         .collect(Collectors.toList()));
+
+                // switch to carrier thread to avoid recursive use of thread-locals
+                vthread.executeOnCarrierThread(() -> {
+                    System.out.println(vthread);
+                    for (StackWalker.StackFrame frame : stack) {
+                        System.out.format("    %s%n", frame.toStackTraceElement());
+                    }
+                    return null;
+                });
+            } catch (Exception e) {
+                throw new InternalError(e);
+            }
+        }
+    }
+
+    private static class StackWalkerHolder {
+        static final StackWalker STACK_WALKER = StackWalker.getInstance();
+    }
 }
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 7df8d9da13c..b6530e1b929 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -40,7 +41,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
-import jdk.internal.event.ThreadSleepEvent;
 import jdk.internal.event.VirtualThreadEndEvent;
 import jdk.internal.event.VirtualThreadPinnedEvent;
 import jdk.internal.event.VirtualThreadStartEvent;
@@ -58,6 +58,7 @@ import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Hidden;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.JvmtiMountTransition;
+import jdk.internal.vm.annotation.ReservedStackAccess;
 import sun.nio.ch.Interruptible;
 import sun.security.action.GetPropertyAction;
 import static java.util.concurrent.TimeUnit.*;
@@ -175,7 +176,7 @@ final class VirtualThread extends BaseVirtualThread {
      */
     private static class VThreadContinuation extends Continuation {
         VThreadContinuation(VirtualThread vthread, Runnable task) {
-            super(VTHREAD_SCOPE, () -> vthread.run(task));
+            super(VTHREAD_SCOPE, wrap(vthread, task));
         }
         @Override
         protected void onPinned(Continuation.Pinned reason) {
@@ -184,6 +185,14 @@ final class VirtualThread extends BaseVirtualThread {
                 PinnedThreadPrinter.printStackTrace(System.out, printAll);
             }
         }
+        private static Runnable wrap(VirtualThread vthread, Runnable task) {
+            return new Runnable() {
+                @Hidden
+                public void run() {
+                    vthread.run(task);
+                }
+            };
+        }
     }
 
     /**
@@ -211,13 +220,13 @@ final class VirtualThread extends BaseVirtualThread {
         }
 
         // notify JVMTI before mount
-        notifyJvmtiMount(true, firstRun);
+        notifyJvmtiMount(/*hide*/true, firstRun);
 
         try {
             cont.run();
         } finally {
             if (cont.isDone()) {
-                afterTerminate(/*executed*/ true);
+                afterTerminate();
             } else {
                 afterYield();
             }
@@ -291,7 +300,7 @@ final class VirtualThread extends BaseVirtualThread {
 
         // first mount
         mount();
-        notifyJvmtiMount(false, true);
+        notifyJvmtiMount(/*hide*/false, /*first*/true);
 
         // emit JFR event if enabled
         if (VirtualThreadStartEvent.isTurnedOn()) {
@@ -319,7 +328,7 @@ final class VirtualThread extends BaseVirtualThread {
 
             } finally {
                 // last unmount
-                notifyJvmtiUnmount(true, true);
+                notifyJvmtiUnmount(/*hide*/true, /*last*/true);
                 unmount();
 
                 // final state
@@ -341,6 +350,7 @@ final class VirtualThread extends BaseVirtualThread {
      * return, the current thread is the virtual thread.
      */
     @ChangesCurrentThread
+    @ReservedStackAccess
     private void mount() {
         // sets the carrier thread
         Thread carrier = Thread.currentCarrierThread();
@@ -367,6 +377,7 @@ final class VirtualThread extends BaseVirtualThread {
      * current thread is the current platform thread.
      */
     @ChangesCurrentThread
+    @ReservedStackAccess
     private void unmount() {
         // set Thread.currentThread() to return the platform thread
         Thread carrier = this.carrierThread;
@@ -404,22 +415,37 @@ final class VirtualThread extends BaseVirtualThread {
         notifyJvmtiHideFrames(false);
     }
 
+    /**
+     * Executes the given value returning task on the current carrier thread.
+     */
+    @ChangesCurrentThread
+    <V> V executeOnCarrierThread(Callable<V> task) throws Exception {
+        assert Thread.currentThread() == this;
+        switchToCarrierThread();
+        try {
+            return task.call();
+        } finally {
+            switchToVirtualThread(this);
+        }
+     }
+
     /**
      * Unmounts this virtual thread, invokes Continuation.yield, and re-mounts the
      * thread when continued. When enabled, JVMTI must be notified from this method.
      * @return true if the yield was successful
      */
+    @Hidden
     @ChangesCurrentThread
     private boolean yieldContinuation() {
         // unmount
-        notifyJvmtiUnmount(true, false);
+        notifyJvmtiUnmount(/*hide*/true, /*last*/false);
         unmount();
         try {
             return Continuation.yield(VTHREAD_SCOPE);
         } finally {
             // re-mount
             mount();
-            notifyJvmtiMount(false, false);
+            notifyJvmtiMount(/*hide*/false, /*first*/false);
         }
     }
 
@@ -436,7 +462,7 @@ final class VirtualThread extends BaseVirtualThread {
             setState(PARKED);
 
             // notify JVMTI that unmount has completed, thread is parked
-            notifyJvmtiUnmount(false, false);
+            notifyJvmtiUnmount(/*hide*/false, /*last*/false);
 
             // may have been unparked while parking
             if (parkPermit && compareAndSetState(PARKED, RUNNABLE)) {
@@ -452,7 +478,7 @@ final class VirtualThread extends BaseVirtualThread {
             setState(RUNNABLE);
 
             // notify JVMTI that unmount has completed, thread is runnable
-            notifyJvmtiUnmount(false, false);
+            notifyJvmtiUnmount(/*hide*/false, /*last*/false);
 
             // external submit if there are no tasks in the local task queue
             if (currentThread() instanceof CarrierThread ct && ct.getQueuedTaskCount() == 0) {
@@ -463,17 +489,26 @@ final class VirtualThread extends BaseVirtualThread {
         }
     }
 
+    /**
+     * Invoked after the thread terminates execution. It notifies anyone
+     * waiting for the thread to terminate.
+     */
+    private void afterTerminate() {
+        afterTerminate(true, true);
+    }
+
     /**
      * Invoked after the thread terminates (or start failed). This method
      * notifies anyone waiting for the thread to terminate.
      *
+     * @param notifyContainer true if its container should be notified
      * @param executed true if the thread executed, false if it failed to start
      */
-    private void afterTerminate(boolean executed) {
+    private void afterTerminate(boolean notifyContainer, boolean executed) {
         assert (state() == TERMINATED) && (carrierThread == null);
 
         if (executed) {
-            notifyJvmtiUnmount(false, true);
+            notifyJvmtiUnmount(/*hide*/false, /*last*/true);
         }
 
         // notify anyone waiting for this virtual thread to terminate
@@ -483,13 +518,13 @@ final class VirtualThread extends BaseVirtualThread {
             termination.countDown();
         }
 
-        if (executed) {
-            // notify container if thread executed
+        // notify container
+        if (notifyContainer) {
             threadContainer().onExit(this);
-
-            // clear references to thread locals
-            clearReferences();
         }
+
+        // clear references to thread locals
+        clearReferences();
     }
 
     /**
@@ -506,12 +541,16 @@ final class VirtualThread extends BaseVirtualThread {
         }
 
         // bind thread to container
+        assert threadContainer() == null;
         setThreadContainer(container);
 
         // start thread
+        boolean addedToContainer = false;
         boolean started = false;
-        container.onStart(this); // may throw
         try {
+            container.onStart(this);  // may throw
+            addedToContainer = true;
+
             // scoped values may be inherited
             inheritScopedValueBindings(container);
 
@@ -521,8 +560,7 @@ final class VirtualThread extends BaseVirtualThread {
         } finally {
             if (!started) {
                 setState(TERMINATED);
-                container.onExit(this);
-                afterTerminate(/*executed*/ false);
+                afterTerminate(addedToContainer, /*executed*/false);
             }
         }
     }
@@ -551,14 +589,21 @@ final class VirtualThread extends BaseVirtualThread {
             return;
 
         // park the thread
+        boolean yielded = false;
         setState(PARKING);
         try {
-            if (!yieldContinuation()) {
-                // park on the carrier thread when pinned
-                parkOnCarrierThread(false, 0);
-            }
+            yielded = yieldContinuation();  // may throw
         } finally {
-            assert (Thread.currentThread() == this) && (state() == RUNNING);
+            assert (Thread.currentThread() == this) && (yielded == (state() == RUNNING));
+            if (!yielded) {
+                assert state() == PARKING;
+                setState(RUNNING);
+            }
+        }
+
+        // park on the carrier thread when pinned
+        if (!yielded) {
+            parkOnCarrierThread(false, 0);
         }
     }
 
@@ -582,14 +627,17 @@ final class VirtualThread extends BaseVirtualThread {
         if (nanos > 0) {
             long startTime = System.nanoTime();
 
-            boolean yielded;
+            boolean yielded = false;
             Future<?> unparker = scheduleUnpark(this::unpark, nanos);
             setState(PARKING);
             try {
-                yielded = yieldContinuation();
+                yielded = yieldContinuation();  // may throw
             } finally {
-                assert (Thread.currentThread() == this)
-                        && (state() == RUNNING || state() == PARKING);
+                assert (Thread.currentThread() == this) && (yielded == (state() == RUNNING));
+                if (!yielded) {
+                    assert state() == PARKING;
+                    setState(RUNNING);
+                }
                 cancel(unparker);
             }
 
@@ -611,10 +659,15 @@ final class VirtualThread extends BaseVirtualThread {
      * @param nanos the waiting time in nanoseconds
      */
     private void parkOnCarrierThread(boolean timed, long nanos) {
-        assert state() == PARKING;
+        assert state() == RUNNING;
 
-        var pinnedEvent = new VirtualThreadPinnedEvent();
-        pinnedEvent.begin();
+        VirtualThreadPinnedEvent event;
+        try {
+            event = new VirtualThreadPinnedEvent();
+            event.begin();
+        } catch (OutOfMemoryError e) {
+            event = null;
+        }
 
         setState(PINNED);
         try {
@@ -632,7 +685,13 @@ final class VirtualThread extends BaseVirtualThread {
         // consume parking permit
         setParkPermit(false);
 
-        pinnedEvent.commit();
+        if (event != null) {
+            try {
+                event.commit();
+            } catch (OutOfMemoryError e) {
+                // ignore
+            }
+        }
     }
 
     /**
@@ -707,41 +766,18 @@ final class VirtualThread extends BaseVirtualThread {
     void tryYield() {
         assert Thread.currentThread() == this;
         setState(YIELDING);
+        boolean yielded = false;
         try {
-            yieldContinuation();
+            yielded = yieldContinuation();  // may throw
         } finally {
-            assert Thread.currentThread() == this;
-            if (state() != RUNNING) {
+            assert (Thread.currentThread() == this) && (yielded == (state() == RUNNING));
+            if (!yielded) {
                 assert state() == YIELDING;
                 setState(RUNNING);
             }
         }
     }
 
-    /**
-     * Sleep the current virtual thread for the given sleep time.
-     *
-     * @param nanos the maximum number of nanoseconds to sleep
-     * @throws InterruptedException if interrupted while sleeping
-     */
-    void sleepNanos(long nanos) throws InterruptedException {
-        assert Thread.currentThread() == this;
-        if (nanos >= 0) {
-            if (ThreadSleepEvent.isTurnedOn()) {
-                ThreadSleepEvent event = new ThreadSleepEvent();
-                try {
-                    event.time = nanos;
-                    event.begin();
-                    doSleepNanos(nanos);
-                } finally {
-                    event.commit();
-                }
-            } else {
-                doSleepNanos(nanos);
-            }
-        }
-    }
-
     /**
      * Sleep the current thread for the given sleep time (in nanoseconds). If
      * nanos is 0 then the thread will attempt to yield.
@@ -751,9 +787,12 @@ final class VirtualThread extends BaseVirtualThread {
      * will consume the parking permit so this method makes available the parking
      * permit after the sleep. This may be observed as a spurious, but benign,
      * wakeup when the thread subsequently attempts to park.
+     *
+     * @param nanos the maximum number of nanoseconds to sleep
+     * @throws InterruptedException if interrupted while sleeping
      */
-    private void doSleepNanos(long nanos) throws InterruptedException {
-        assert nanos >= 0;
+    void sleepNanos(long nanos) throws InterruptedException {
+        assert Thread.currentThread() == this && nanos >= 0;
         if (getAndClearInterrupt())
             throw new InterruptedException();
         if (nanos == 0) {
diff --git a/src/java.base/share/classes/java/util/concurrent/Executors.java b/src/java.base/share/classes/java/util/concurrent/Executors.java
index ac7d5338c66..24aa3f0a08c 100644
--- a/src/java.base/share/classes/java/util/concurrent/Executors.java
+++ b/src/java.base/share/classes/java/util/concurrent/Executors.java
@@ -46,7 +46,6 @@ import java.security.PrivilegedExceptionAction;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import jdk.internal.javac.PreviewFeature;
 import jdk.internal.ref.CleanerFactory;
 import sun.security.util.SecurityConstants;
 
@@ -249,9 +248,8 @@ public class Executors {
      * @param threadFactory the factory to use when creating new threads
      * @return a new executor that creates a new Thread for each task
      * @throws NullPointerException if threadFactory is null
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
     public static ExecutorService newThreadPerTaskExecutor(ThreadFactory threadFactory) {
         return ThreadPerTaskExecutor.create(threadFactory);
     }
@@ -265,10 +263,8 @@ public class Executors {
      * that creates virtual threads.
      *
      * @return a new executor that creates a new virtual Thread for each task
-     * @throws UnsupportedOperationException if preview features are not enabled
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
     public static ExecutorService newVirtualThreadPerTaskExecutor() {
         ThreadFactory factory = Thread.ofVirtual().factory();
         return newThreadPerTaskExecutor(factory);
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadPerTaskExecutor.java b/src/java.base/share/classes/java/util/concurrent/ThreadPerTaskExecutor.java
index 5034957fee6..2577a282597 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadPerTaskExecutor.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadPerTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -325,15 +325,14 @@ class ThreadPerTaskExecutor extends ThreadContainer implements ExecutorService {
      * notified when the task completes.
      */
     private static class ThreadBoundFuture<T>
-            extends CompletableFuture<T> implements Runnable {
+            extends FutureTask<T> implements Runnable {
 
         final ThreadPerTaskExecutor executor;
-        final Callable<T> task;
         final Thread thread;
 
         ThreadBoundFuture(ThreadPerTaskExecutor executor, Callable<T> task) {
+            super(task);
             this.executor = executor;
-            this.task = task;
             this.thread = executor.newThread(this);
         }
 
@@ -342,28 +341,8 @@ class ThreadPerTaskExecutor extends ThreadContainer implements ExecutorService {
         }
 
         @Override
-        public void run() {
-            if (Thread.currentThread() != thread) {
-                // should not happen except where something casts this object
-                // to a Runnable and invokes the run method.
-                throw new WrongThreadException();
-            }
-            try {
-                T result = task.call();
-                complete(result);
-            } catch (Throwable e) {
-                completeExceptionally(e);
-            } finally {
-                executor.taskComplete(thread);
-            }
-        }
-
-        @Override
-        public boolean cancel(boolean mayInterruptIfRunning) {
-            boolean cancelled = super.cancel(mayInterruptIfRunning);
-            if (cancelled && mayInterruptIfRunning)
-                thread.interrupt();
-            return cancelled;
+        protected void done() {
+            executor.taskComplete(thread);
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index f02db39ad65..84d3cce737b 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ public @interface PreviewFeature {
         SWITCH_PATTERN_MATCHING(),
         @JEP(number=432, title="Record Patterns", status="Second Preview")
         RECORD_PATTERNS,
-        @JEP(number=436, title="Virtual Threads", status="Second Preview")
+        // not used
         VIRTUAL_THREADS,
         @JEP(number=434, title="Foreign Function & Memory API", status="Second Preview")
         FOREIGN,
diff --git a/src/java.base/share/classes/jdk/internal/vm/Continuation.java b/src/java.base/share/classes/jdk/internal/vm/Continuation.java
index fcff2adce75..f8d09c74647 100644
--- a/src/java.base/share/classes/jdk/internal/vm/Continuation.java
+++ b/src/java.base/share/classes/jdk/internal/vm/Continuation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package jdk.internal.vm;
 
-import jdk.internal.misc.PreviewFeatures;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.annotation.DontInline;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
@@ -36,6 +35,7 @@ import java.util.Set;
 import java.util.function.Supplier;
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.vm.annotation.Hidden;
 
 /**
  * A one-shot delimited continuation.
@@ -47,7 +47,6 @@ public class Continuation {
     private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
     static {
         ContinuationSupport.ensureSupported();
-        PreviewFeatures.ensureEnabled();
 
         StackChunk.init(); // ensure StackChunk class is initialized
 
@@ -303,6 +302,7 @@ public class Continuation {
     private native static void enterSpecial(Continuation c, boolean isContinue, boolean isVirtualThread);
 
 
+    @Hidden
     @DontInline
     @IntrinsicCandidate
     private static void enter(Continuation c, boolean isContinue) {
@@ -315,8 +315,9 @@ public class Continuation {
         }
     }
 
+    @Hidden
     private void enter0() {
-      target.run();
+        target.run();
     }
 
     private boolean isStarted() {
@@ -338,6 +339,7 @@ public class Continuation {
      * @return {@code true} for success; {@code false} for failure
      * @throws IllegalStateException if not currently in the given {@code scope},
      */
+    @Hidden
     public static boolean yield(ContinuationScope scope) {
         Continuation cont = JLA.getContinuation(currentCarrierThread());
         Continuation c;
@@ -349,6 +351,7 @@ public class Continuation {
         return cont.yield0(scope, null);
     }
 
+    @Hidden
     private boolean yield0(ContinuationScope scope, Continuation child) {
         preempted = false;
 
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index d7cbe6495e6..1576df9a236 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -148,15 +148,10 @@ module java.base {
     // module declaration be annotated with jdk.internal.javac.ParticipatesInPreview
     exports jdk.internal.javac to
         java.compiler,
-        java.management, // participates in preview features
         jdk.compiler,
-        jdk.incubator.concurrent, // participates in preview features
         jdk.incubator.vector, // participates in preview features
         jdk.jartool, // participates in preview features
-        jdk.jdi,
-        jdk.jfr,
-        jdk.jshell,
-        jdk.management;
+        jdk.jshell;
     exports jdk.internal.access to
         java.desktop,
         java.logging,
diff --git a/src/java.base/share/native/include/jni.h b/src/java.base/share/native/include/jni.h
index 44c5604cec8..c85da1bc67f 100644
--- a/src/java.base/share/native/include/jni.h
+++ b/src/java.base/share/native/include/jni.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1992,6 +1992,7 @@ JNI_OnUnload(JavaVM *vm, void *reserved);
 #define JNI_VERSION_10  0x000a0000
 #define JNI_VERSION_19  0x00130000
 #define JNI_VERSION_20  0x00140000
+#define JNI_VERSION_21  0x00150000
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/java.management/share/classes/module-info.java b/src/java.management/share/classes/module-info.java
index f86c6b752a5..8544d858ac5 100644
--- a/src/java.management/share/classes/module-info.java
+++ b/src/java.management/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,6 @@
  * questions.
  */
 
-import jdk.internal.javac.ParticipatesInPreview;
-
 /**
  * Defines the Java Management Extensions (JMX) API.
  * <P>
@@ -37,7 +35,6 @@ import jdk.internal.javac.ParticipatesInPreview;
  * @moduleGraph
  * @since 9
  */
-@ParticipatesInPreview
 module java.management {
 
     exports java.lang.management;
diff --git a/src/java.se/share/data/jdwp/jdwp.spec b/src/java.se/share/data/jdwp/jdwp.spec
index b781deb4497..be0bf8d39d1 100644
--- a/src/java.se/share/data/jdwp/jdwp.spec
+++ b/src/java.se/share/data/jdwp/jdwp.spec
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2156,12 +2156,9 @@ JDWP "Java(tm) Debug Wire Protocol"
         )
     )
     (Command IsVirtual=15
-        "<b>IsVirtual is a preview API of the Java platform.</b> "
-        "<em>Preview features may be removed in a future release, or upgraded to "
-        "permanent features of the Java platform.</em> Since JDWP version 19."
-        "<p>"
         "Determine if a thread is a "
         "<a href=../../api/java.base/java/lang/Thread.html#virtual-threads>virtual thread</a>."
+        "<p>Since JDWP version 21."
         (Out
             (threadObject thread "The thread object ID.")
         )
@@ -2537,12 +2534,9 @@ JDWP "Java(tm) Debug Wire Protocol"
                         )
                     )
                     (Alt PlatformThreadsOnly=13
-                        "<b>PlatformThreadsOnly is a preview API of the Java platform.</b> "
-                        "<em>Preview features may be removed in a future release, or upgraded to "
-                        "permanent features of the Java platform.</em> Since JDWP version 19."
-                        "<p>"
                         "For thread start and thread end events, restrict the "
                         "events so they are only sent for platform threads."
+                        "<p>Since JDWP version 21."
                     )
 
                 )
diff --git a/src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/StructuredTaskScope.java b/src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/StructuredTaskScope.java
index 2f983d52372..9e6c66b8695 100644
--- a/src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/StructuredTaskScope.java
+++ b/src/jdk.incubator.concurrent/share/classes/jdk/incubator/concurrent/StructuredTaskScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
-import jdk.internal.misc.PreviewFeatures;
 import jdk.internal.misc.ThreadFlock;
 
 /**
@@ -335,11 +334,8 @@ public class StructuredTaskScope<T> implements AutoCloseable {
      *
      * <p> This constructor is equivalent to invoking the 2-arg constructor with a name
      * of {@code null} and a thread factory that creates virtual threads.
-     *
-     * @throws UnsupportedOperationException if preview features are not enabled
      */
     public StructuredTaskScope() {
-        PreviewFeatures.ensureEnabled();
         this.factory = Thread.ofVirtual().factory();
         this.flock = ThreadFlock.open(null);
     }
diff --git a/src/jdk.incubator.concurrent/share/classes/module-info.java b/src/jdk.incubator.concurrent/share/classes/module-info.java
index 73e8db6cb6a..857c6125f96 100644
--- a/src/jdk.incubator.concurrent/share/classes/module-info.java
+++ b/src/jdk.incubator.concurrent/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,12 @@
  * questions.
  */
 
-import jdk.internal.javac.ParticipatesInPreview;
-
 /**
  * Defines non-final APIs for concurrent programming.
  * {@Incubating}
  *
  * @moduleGraph
  */
-@ParticipatesInPreview
 module jdk.incubator.concurrent {
     exports jdk.incubator.concurrent;
 }
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
index 3b45b927086..a49fe4c547c 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package com.sun.jdi;
 
 import java.util.List;
 import com.sun.jdi.event.EventSet;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * A thread object from the target VM.
@@ -516,9 +515,8 @@ public interface ThreadReference extends ObjectReference {
      * @implSpec
      * The default implementation throws {@code UnsupportedOperationException}.
      *
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
     default boolean isVirtual() {
         throw new UnsupportedOperationException("Method not implemented");
     }
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
index 8695113d2cc..655eb258870 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import com.sun.jdi.ThreadReference;
 import com.sun.jdi.event.EventQueue;
 import com.sun.jdi.event.EventSet;
 import com.sun.jdi.event.ThreadDeathEvent;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * Request for notification when a thread terminates in the target VM.
@@ -70,9 +69,8 @@ public interface ThreadDeathRequest extends EventRequest {
      * @throws InvalidRequestStateException if this request is currently
      * enabled or has been deleted
      *
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
     default void addPlatformThreadsOnlyFilter() {
         throw new UnsupportedOperationException("Method not implemented");
     }
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
index 0e17f868470..4692b0c9bd9 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import com.sun.jdi.ThreadReference;
 import com.sun.jdi.event.EventQueue;
 import com.sun.jdi.event.EventSet;
 import com.sun.jdi.event.ThreadStartEvent;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * Request for notification when a thread starts execution in the target VM.
@@ -70,9 +69,8 @@ public interface ThreadStartRequest extends EventRequest {
      * @throws InvalidRequestStateException if this request is currently
      * enabled or has been deleted
      *
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
     default void addPlatformThreadsOnlyFilter() {
         throw new UnsupportedOperationException("Method not implemented");
     }
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
index 1ea0b68d80e..bbbeb6b12ab 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -477,7 +477,6 @@ public class TTYResources extends java.util.ListResourceBundle {
              "                      connect to target VM using named connector with listed argument values\n" +
              "    -dbgtrace [flags] print info for debugging {0}\n" +
              "    -trackallthreads  Track all threads, including virtual threads.\n" +
-             "                      Virtual threads are a preview feature of the Java platform.\n" +
              "    -tclient          run the application in the HotSpot(TM) Client Compiler\n" +
              "    -tserver          run the application in the HotSpot(TM) Server Compiler\n" +
              "    -R<option>        forward <option> to debuggee process if launched by jdb, otherwise ignored\n" +
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties
index 8937d0fa520..9fb2c6cfb27 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources/jdi.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ sun.quote = Character used to combine space-delimited text into a single command
 sun.quote.label = Quote
 sun.vm_exec = Name of the Java VM launcher
 sun.vm_exec.label = Launcher
-sun.include_virtualthreads = List of all threads includes virtual threads as well as platform threads. Virtual threads are a preview feature of the Java platform.
+sun.include_virtualthreads = List of all threads includes virtual threads as well as platform threads.
 sun.include_virtualthreads.label = Include Virtual Threads
 sun.description = Launches target using Sun Java VM command line and attaches to it
 generic_attaching.address = Address to which to attach for VM connections
diff --git a/src/jdk.jdi/share/man/jdb.1 b/src/jdk.jdi/share/man/jdb.1
index 43cf53d1e7f..ec04aabb71c 100644
--- a/src/jdk.jdi/share/man/jdb.1
+++ b/src/jdk.jdi/share/man/jdb.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved.
 .\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 .\"
 .\" This code is free software; you can redistribute it and/or modify it
@@ -215,7 +215,6 @@ Runs the application in the Java HotSpot VM client.
 \f[V]-trackallthreads\f[R]
 Track all threads as they are created, including virtual threads.
 See \f[B]Working With Virtual Threads\f[R] below.
-Virtual threads are a preview feature of the Java platform.
 .TP
 \f[V]-tserver\f[R]
 Runs the application in the Java HotSpot VM server.
@@ -252,10 +251,6 @@ Other options are supported to provide alternate mechanisms for
 connecting the debugger to the JVM that it\[aq]s to debug.
 .SH WORKING WITH VIRTUAL THREADS
 .PP
-Virtual threads are a preview feature of the Java platform.
-Preview features may be removed in a future release, or upgraded to
-permanent features of the Java platform.
-.PP
 Often virtual theads are created in such large numbers and frequency
 that they can overwhelm a debugger.
 For this reason by default JDB does not keep track of virtual threads as
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
index b67c784d362..a2cda11ecd4 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -827,7 +827,6 @@ printUsage(void)
  "onuncaught=y|n                   debug on any uncaught?            n\n"
  "timeout=<timeout value>          for listen/attach in milliseconds n\n"
  "includevirtualthreads=y|n        List of all threads includes virtual threads as well as platform threads.\n"
- "                                 Virtual threads are a preview feature of the Java platform.\n"
  "                                                                   n\n"
  "mutf8=y|n                        output modified utf-8             n\n"
  "quiet=y|n                        control over terminal messages    n\n"));
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
index c836ffe98e5..7595339cc36 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package jdk.jfr.consumer;
 
 import jdk.jfr.internal.consumer.ObjectContext;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * A recorded thread.
@@ -113,9 +112,8 @@ public final class RecordedThread extends RecordedObject {
     /**
      * {@return {@code true} if this is a virtual Thread, {@code false} otherwise}
      *
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
     public boolean isVirtual() {
         return getTyped("virtual", Boolean.class, Boolean.FALSE);
     }
diff --git a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
index 76c07781da4..b1d86a743a5 100644
--- a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
+++ b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package com.sun.management;
 
 import java.io.IOException;
 import java.lang.management.PlatformManagedObject;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * Diagnostic management interface for the HotSpot Virtual Machine.
@@ -147,18 +146,16 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
      *         access to the file or {@link java.lang.management.ManagementPermission
      *         ManagementPermission("control")} is denied
      * @throws UnsupportedOperationException if this operation is not supported
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
     default void dumpThreads(String outputFile, ThreadDumpFormat format) throws IOException {
         throw new UnsupportedOperationException();
     }
 
     /**
      * Thread dump format.
-     * @since 19
+     * @since 21
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
     public static enum ThreadDumpFormat {
         /**
          * Plain text format.
diff --git a/test/hotspot/jtreg/compiler/codecache/stress/Helper.java b/test/hotspot/jtreg/compiler/codecache/stress/Helper.java
index 6c6d3acbfc2..ca6dec539cb 100644
--- a/test/hotspot/jtreg/compiler/codecache/stress/Helper.java
+++ b/test/hotspot/jtreg/compiler/codecache/stress/Helper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,26 +65,7 @@ public final class Helper {
     }
 
     public static ThreadFactory threadFactory(boolean virtual) {
-        // After virtual thread Preview:
-        // return (virtual ? Thread.ofVirtual() : Thread.ofPlatform().daemon()).factory();
-        if (virtual) {
-            return virtualThreadFactory();
-        } else {
-            return runnable -> {
-                Thread t = new Thread(runnable);
-                t.setDaemon(true);
-                return t;
-            };
-        }
-    }
-
-    private static ThreadFactory virtualThreadFactory() {
-        try {
-            return (ThreadFactory)Class.forName("java.lang.Thread$Builder").getMethod("factory")
-                .invoke(Thread.class.getMethod("ofVirtual").invoke(null));
-        } catch (ReflectiveOperationException ex) {
-            throw new AssertionError(ex);
-        }
+        return (virtual ? Thread.ofVirtual() : Thread.ofPlatform().daemon()).factory();
     }
 
     public static int callMethod(Callable<Integer> callable, int expected) {
diff --git a/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java b/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java
index e1d43b5b3d9..ccf7a06d400 100644
--- a/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/stress/OverloadCompileQueueTest.java
@@ -36,6 +36,9 @@
  *                   -XX:+WhiteBoxAPI
  *                   -XX:CompileCommand=dontinline,compiler.codecache.stress.Helper$TestCase::method
  *                   -XX:CompileCommand=exclude,java.lang.Thread::sleep
+ *                   -XX:CompileCommand=exclude,java.lang.Thread::beforeSleep
+ *                   -XX:CompileCommand=exclude,java.lang.Thread::afterSleep
+ *                   -XX:CompileCommand=exclude,java.lang.Math::min
  *                   -XX:CompileCommand=exclude,jdk.internal.event.ThreadSleepEvent::*
  *                   -XX:CompileCommand=exclude,jdk.internal.event.SleepEvent::*
  *                   -XX:CompileCommand=exclude,jdk.internal.event.Event::*
@@ -45,6 +48,9 @@
  *                   -XX:+WhiteBoxAPI
  *                   -XX:CompileCommand=dontinline,compiler.codecache.stress.Helper$TestCase::method
  *                   -XX:CompileCommand=exclude,java.lang.Thread::sleep
+ *                   -XX:CompileCommand=exclude,java.lang.Thread::beforeSleep
+ *                   -XX:CompileCommand=exclude,java.lang.Thread::afterSleep
+ *                   -XX:CompileCommand=exclude,java.lang.Math::min
  *                   -XX:CompileCommand=exclude,jdk.internal.event.ThreadSleepEvent::*
  *                   -XX:CompileCommand=exclude,jdk.internal.event.SleepEvent::*
  *                   -XX:CompileCommand=exclude,jdk.internal.event.Event::*
diff --git a/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationAllTest.java b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationAllTest.java
index d5f3349f78a..66b3972b2a1 100644
--- a/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationAllTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationAllTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,14 +48,14 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeRandom
  *                   -XX:CompileCommand=dontinline,compiler.codecache.stress.Helper$TestCase::method
  *                   -XX:-SegmentedCodeCache
- *                   --enable-preview -DhelperVirtualThread=true
+ *                   -DhelperVirtualThread=true
  *                   compiler.codecache.stress.UnexpectedDeoptimizationAllTest
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeRandom
  *                   -XX:CompileCommand=dontinline,compiler.codecache.stress.Helper$TestCase::method
  *                   -XX:+SegmentedCodeCache
- *                   --enable-preview -DhelperVirtualThread=true
+ *                   -DhelperVirtualThread=true
  *                   compiler.codecache.stress.UnexpectedDeoptimizationAllTest
  */
 
diff --git a/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java
index 36afbb30224..b3def9455c4 100644
--- a/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,14 +48,14 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeRandom
  *                   -XX:CompileCommand=dontinline,compiler.codecache.stress.Helper$TestCase::method
  *                   -XX:-SegmentedCodeCache
- *                   --enable-preview -DhelperVirtualThread=true
+ *                   -DhelperVirtualThread=true
  *                   compiler.codecache.stress.UnexpectedDeoptimizationTest
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:-DeoptimizeRandom
  *                   -XX:CompileCommand=dontinline,compiler.codecache.stress.Helper$TestCase::method
  *                   -XX:+SegmentedCodeCache
- *                   --enable-preview -DhelperVirtualThread=true
+ *                   -DhelperVirtualThread=true
  *                   compiler.codecache.stress.UnexpectedDeoptimizationTest
  */
 
diff --git a/test/hotspot/jtreg/native_sanity/JniVersion.java b/test/hotspot/jtreg/native_sanity/JniVersion.java
index 467a28e109f..099ea547fca 100644
--- a/test/hotspot/jtreg/native_sanity/JniVersion.java
+++ b/test/hotspot/jtreg/native_sanity/JniVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,12 @@
  */
 public class JniVersion {
 
-    public static final int JNI_VERSION_20 = 0x00140000;
+    public static final int JNI_VERSION_21 = 0x00150000;
 
     public static void main(String... args) throws Exception {
         System.loadLibrary("JniVersion");
         int res = getJniVersion();
-        if (res != JNI_VERSION_20) {
+        if (res != JNI_VERSION_21) {
             throw new Exception("Unexpected value returned from getJniVersion(): 0x" + Integer.toHexString(res));
         }
     }
diff --git a/test/hotspot/jtreg/runtime/Monitor/SyncOnValueBasedClassTest.java b/test/hotspot/jtreg/runtime/Monitor/SyncOnValueBasedClassTest.java
index 1cfa6ff5dff..28bfd0f2bd4 100644
--- a/test/hotspot/jtreg/runtime/Monitor/SyncOnValueBasedClassTest.java
+++ b/test/hotspot/jtreg/runtime/Monitor/SyncOnValueBasedClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,7 @@ import java.util.stream.*;
  * @requires vm.flagless
  * @requires vm.flavor != "zero"
  * @library /test/lib
- * @enablePreview
- * @run main/othervm/timeout=180000 --enable-preview SyncOnValueBasedClassTest
+ * @run main/othervm/timeout=180000 SyncOnValueBasedClassTest
  */
 
 public class SyncOnValueBasedClassTest {
@@ -63,7 +62,7 @@ public class SyncOnValueBasedClassTest {
 
     private static void generateTests() {
         initTestObjects();
-        String[] commonFatalTestsFlags = {"--enable-preview", "-XX:+UnlockDiagnosticVMOptions", "-XX:-CreateCoredumpOnCrash", "-XX:DiagnoseSyncOnValueBasedClasses=1"};
+        String[] commonFatalTestsFlags = {"-XX:+UnlockDiagnosticVMOptions", "-XX:-CreateCoredumpOnCrash", "-XX:DiagnoseSyncOnValueBasedClasses=1"};
         fatalTests = new String[specificFlags.length * testObjects.size()][];
         for (int i = 0; i < specificFlags.length; i++) {
             for (int j = 0; j < testObjects.size(); j++) {
@@ -73,7 +72,7 @@ public class SyncOnValueBasedClassTest {
                                           .toArray(String[]::new);
             }
         }
-        String[] commonLogTestsFlags = {"--enable-preview", "-XX:+UnlockDiagnosticVMOptions", "-XX:DiagnoseSyncOnValueBasedClasses=2"};
+        String[] commonLogTestsFlags = {"-XX:+UnlockDiagnosticVMOptions", "-XX:DiagnoseSyncOnValueBasedClasses=2"};
         logTests = new String[specificFlags.length][];
         for (int i = 0; i < specificFlags.length; i++) {
             logTests[i] = Stream.of(commonLogTestsFlags, specificFlags[i], new String[] {"SyncOnValueBasedClassTest$LogTest"})
@@ -168,10 +167,10 @@ public class SyncOnValueBasedClassTest {
 
     // Very basic sanity tests to show things work for virtual threads too.
     private static void virtualThreadTests() throws Exception {
-        final String[] vtTest = { "--enable-preview", "-XX:+UnlockDiagnosticVMOptions", "-XX:-CreateCoredumpOnCrash",
+        final String[] vtTest = { "-XX:+UnlockDiagnosticVMOptions", "-XX:-CreateCoredumpOnCrash",
                                   "", "SyncOnValueBasedClassTest$VTTest" };
         // Fatal test
-        vtTest[3] = "-XX:DiagnoseSyncOnValueBasedClasses=1";
+        vtTest[2] = "-XX:DiagnoseSyncOnValueBasedClasses=1";
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(vtTest);
         OutputAnalyzer output = ProcessTools.executeProcess(pb);
         output.shouldContain("fatal error: Synchronizing on object");
@@ -179,7 +178,7 @@ public class SyncOnValueBasedClassTest {
         output.shouldNotHaveExitValue(0);
 
         // Log test
-        vtTest[3] = "-XX:DiagnoseSyncOnValueBasedClasses=2";
+        vtTest[2] = "-XX:DiagnoseSyncOnValueBasedClasses=2";
         pb = ProcessTools.createJavaProcessBuilder(vtTest);
         output = ProcessTools.executeProcess(pb);
         output.shouldHaveExitValue(0);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
index 3dd35fa0f07..d8459359604 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds
  * @run driver RedefineClassHelper
  * @build jdk.test.whitebox.WhiteBox
- * @compile --enable-preview -source ${jdk.version} RedefineRunningMethods_SharedHelper.java
+ * @compile RedefineRunningMethods_SharedHelper.java
  * @run driver RedefineRunningMethods_Shared
  */
 
@@ -59,8 +59,7 @@ public class RedefineRunningMethods_Shared {
         OutputAnalyzer output;
         TestCommon.testDump(appJar, shared_classes,
                             // command-line arguments ...
-                            use_whitebox_jar,
-                            "--enable-preview");
+                            use_whitebox_jar);
 
         // RedefineRunningMethods.java contained this:
         // @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+iklass+add=trace,redefine+class+iklass+purge=trace RedefineRunningMethods
@@ -69,7 +68,6 @@ public class RedefineRunningMethods_Shared {
                                  use_whitebox_jar,
                                  "-XX:+UnlockDiagnosticVMOptions",
                                  "-XX:+WhiteBoxAPI",
-                                 "--enable-preview",
                                  // These arguments are expected by RedefineRunningMethods
                                  "-javaagent:redefineagent.jar",
                                  "-Xlog:redefine+class+iklass+add=trace,redefine+class+iklass+purge=trace",
diff --git a/test/hotspot/jtreg/runtime/jni/IsVirtualThread/IsVirtualThread.java b/test/hotspot/jtreg/runtime/jni/IsVirtualThread/IsVirtualThread.java
index c305be39e6e..d66e785ae57 100644
--- a/test/hotspot/jtreg/runtime/jni/IsVirtualThread/IsVirtualThread.java
+++ b/test/hotspot/jtreg/runtime/jni/IsVirtualThread/IsVirtualThread.java
@@ -26,7 +26,6 @@
  * @bug 8284161
  * @summary Test JNI IsVirtualThread
  * @library /test/lib
- * @enablePreview
  * @run main/native/othervm IsVirtualThread
  */
 
@@ -34,7 +33,6 @@
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @library /test/lib
- * @enablePreview
  * @run main/native/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations IsVirtualThread
  */
 
diff --git a/test/hotspot/jtreg/runtime/jni/checked/TestPrimitiveArrayCriticalWithBadParam.java b/test/hotspot/jtreg/runtime/jni/checked/TestPrimitiveArrayCriticalWithBadParam.java
index 36c48a7fd19..ed5d6b052b2 100644
--- a/test/hotspot/jtreg/runtime/jni/checked/TestPrimitiveArrayCriticalWithBadParam.java
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestPrimitiveArrayCriticalWithBadParam.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * @summary -Xcheck:jni should catch wrong parameter passed to GetPrimitiveArrayCritical
  * @comment Tests reporting with regular thread and virtual thread.
  * @library /test/lib
- * @enablePreview
  * @run main/native TestPrimitiveArrayCriticalWithBadParam
  */
 import java.util.List;
diff --git a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
index 264061ce7f6..fc0fff0042d 100644
--- a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
+++ b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,8 @@ import java.util.concurrent.atomic.AtomicReference;
  * @test JNIMonitor
  * @summary Tests that JNI monitors work correctly with virtual threads
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} JNIMonitor.java
- * @run main/native/othervm --enable-preview JNIMonitor
+ * @compile JNIMonitor.java
+ * @run main/native/othervm JNIMonitor
  */
 
 public class JNIMonitor {
diff --git a/test/hotspot/jtreg/runtime/vthread/RedefineClass.java b/test/hotspot/jtreg/runtime/vthread/RedefineClass.java
index 3acec93e603..33a9d52a523 100644
--- a/test/hotspot/jtreg/runtime/vthread/RedefineClass.java
+++ b/test/hotspot/jtreg/runtime/vthread/RedefineClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 /**
  * @test
  * @summary Regression test based on runtime/Metaspace/DefineClass.java
- * @compile --enable-preview -source ${jdk.version} RedefineClass.java
- * @run main/othervm --enable-preview -Djdk.attach.allowAttachSelf RedefineClass
+ * @compile RedefineClass.java
+ * @run main/othervm -Djdk.attach.allowAttachSelf RedefineClass
  */
 
 import java.io.ByteArrayOutputStream;
diff --git a/test/hotspot/jtreg/runtime/vthread/TestObjectAllocationSampleEvent.java b/test/hotspot/jtreg/runtime/vthread/TestObjectAllocationSampleEvent.java
index 0c4c6dedd74..9fdb03fcb9f 100644
--- a/test/hotspot/jtreg/runtime/vthread/TestObjectAllocationSampleEvent.java
+++ b/test/hotspot/jtreg/runtime/vthread/TestObjectAllocationSampleEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@ import jdk.jfr.consumer.RecordingStream;
  * @summary Tests ObjectAllocationSampleEvent
  * @requires vm.hasJFR
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} TestObjectAllocationSampleEvent.java
- * @run main/othervm --enable-preview TestObjectAllocationSampleEvent
+ * @compile TestObjectAllocationSampleEvent.java
+ * @run main/othervm TestObjectAllocationSampleEvent
  */
 public class TestObjectAllocationSampleEvent {
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/GetSetLocalUnsuspended.java b/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/GetSetLocalUnsuspended.java
index cd5b3c81718..1d5187a6b86 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/GetSetLocalUnsuspended.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/GetSetLocalUnsuspended.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 /**
  * @test
  * @summary Verifies JVMTI GetLocalXXX/SetLocalXXX return errors for unsuspended vthreads
- * @enablePreview
  * @library /test/lib
  * @run main/othervm/native -agentlib:GetSetLocalUnsuspended GetSetLocalUnsuspended
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
index c96dc8ed2fb..7d40301222c 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
  * @bug 8185164
  * @summary Checks that a contended monitor does not show up in the list of owned monitors
  * @requires vm.jvmti
- * @compile --enable-preview -source ${jdk.version} GetOwnedMonitorInfoTest.java
- * @run main/othervm/native --enable-preview -agentlib:GetOwnedMonitorInfoTest GetOwnedMonitorInfoTest
+ * @compile GetOwnedMonitorInfoTest.java
+ * @run main/othervm/native -agentlib:GetOwnedMonitorInfoTest GetOwnedMonitorInfoTest
  */
 
 import java.io.PrintStream;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorStackDepthInfo/GetOwnedMonitorStackDepthInfoTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorStackDepthInfo/GetOwnedMonitorStackDepthInfoTest.java
index 420803e59e8..7a50601b422 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorStackDepthInfo/GetOwnedMonitorStackDepthInfoTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorStackDepthInfo/GetOwnedMonitorStackDepthInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
  * @bug 8153629
  * @summary Need to cover JVMTI's GetOwnedMonitorStackDepthInfo function
  * @requires vm.jvmti
- * @compile --enable-preview -source ${jdk.version} GetOwnedMonitorStackDepthInfoTest.java
- * @run main/othervm/native --enable-preview -agentlib:GetOwnedMonitorStackDepthInfoTest GetOwnedMonitorStackDepthInfoTest
+ * @compile GetOwnedMonitorStackDepthInfoTest.java
+ * @run main/othervm/native -agentlib:GetOwnedMonitorStackDepthInfoTest GetOwnedMonitorStackDepthInfoTest
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorVMEventsTest.java b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorVMEventsTest.java
index a8c93e346f2..65625aea2e7 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorVMEventsTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorVMEventsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -47,9 +47,8 @@ import java.util.concurrent.ThreadFactory;
  * @requires vm.jvmti
  * @requires !vm.graal.enabled
  * @build Frame HeapMonitor
- * @compile --enable-preview -source ${jdk.version} HeapMonitorVMEventsTest.java
- * @run main/othervm/native --enable-preview
- *                          -XX:+UnlockDiagnosticVMOptions
+ * @compile HeapMonitorVMEventsTest.java
+ * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions
  *                          -XX:DisableIntrinsic=_clone
  *                          -agentlib:HeapMonitorTest MyPackage.HeapMonitorVMEventsTest virtual
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethods.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethods.java
index 811bdd0cc78..123ef276b60 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethods.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,8 @@
  *          java.instrument
  *          jdk.jartool/sun.tools.jar
  * @run main RedefineClassHelper
- * @compile --enable-preview -source ${jdk.version} RedefineRunningMethods.java
+ * @compile RedefineRunningMethods.java
  * @run main/othervm/timeout=180
- *         --enable-preview
  *         -javaagent:redefineagent.jar
  *         -Xlog:redefine+class+iklass+add=trace,redefine+class+iklass+purge=trace,class+loader+data=debug,safepoint+cleanup,gc+phases=debug:rt.log
  *         RedefineRunningMethods
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithBacktrace.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithBacktrace.java
index f9c13ecd7a4..bc69bd971de 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithBacktrace.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRunningMethodsWithBacktrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,9 @@
  *          java.instrument
  *          jdk.jartool/sun.tools.jar
  * @run main RedefineClassHelper
- * @compile --enable-preview -source ${jdk.version} RedefineRunningMethodsWithBacktrace.java
- * @run main/othervm --enable-preview -javaagent:redefineagent.jar RedefineRunningMethodsWithBacktrace platform
- * @run main/othervm --enable-preview -javaagent:redefineagent.jar RedefineRunningMethodsWithBacktrace virtual
+ * @compile RedefineRunningMethodsWithBacktrace.java
+ * @run main/othervm -javaagent:redefineagent.jar RedefineRunningMethodsWithBacktrace platform
+ * @run main/othervm -javaagent:redefineagent.jar RedefineRunningMethodsWithBacktrace virtual
  */
 
 import java.util.concurrent.ThreadFactory;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java
index 2e87a866230..82d4dccd5f7 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/breakpoint01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,8 @@ import java.io.*;
  *
  * @comment make sure breakpoint01 is compiled with full debug info
  * @clean breakpoint01
- * @compile --enable-preview -source ${jdk.version} -g:lines,source,vars breakpoint01.java
- * @run main/othervm/native --enable-preview -agentlib:breakpoint01 breakpoint01
+ * @compile -g:lines,source,vars breakpoint01.java
+ * @run main/othervm/native -agentlib:breakpoint01 breakpoint01
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java
index 5500c02a58a..f163777d1f8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/classload01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,8 @@ import java.io.*;
  *     Fixed the 5031200 bug.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} classload01.java
- * @run main/othervm/native --enable-preview -agentlib:classload01 classload01
+ * @compile classload01.java
+ * @run main/othervm/native -agentlib:classload01 classload01
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java
index 8f0d4f6ad58..eafe06587e2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/classprep01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} classprep01.java
- * @run main/othervm/native --enable-preview -agentlib:classprep01 classprep01
+ * @compile classprep01.java
+ * @run main/othervm/native -agentlib:classprep01 classprep01
  */
 
 public class classprep01 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/exception01.java b/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/exception01.java
index e0e66b7f568..56a97be6ca5 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/exception01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/exception01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
  *
  * @library /test/lib
  * @compile exception01a.jasm
- * @compile --enable-preview -source ${jdk.version} exception01.java
- * @run main/othervm/native --enable-preview -agentlib:exception01 exception01
+ * @compile exception01.java
+ * @run main/othervm/native -agentlib:exception01 exception01
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/excatch01.java b/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/excatch01.java
index 50a17e89983..88c338c7aca 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/excatch01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/excatch01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
  *
  * @library /test/lib
  * @compile excatch01a.jasm
- * @compile --enable-preview -source ${jdk.version} excatch01.java
- * @run main/othervm/native --enable-preview -agentlib:excatch01 excatch01
+ * @compile excatch01.java
+ * @run main/othervm/native -agentlib:excatch01 excatch01
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/fieldacc01.java b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/fieldacc01.java
index 455e7b792da..a92efee2ff4 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/fieldacc01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/fieldacc01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@
  *
  * @library /test/lib
  * @compile fieldacc01a.jasm
- * @compile --enable-preview -source ${jdk.version} fieldacc01.java
- * @run main/othervm/native --enable-preview -agentlib:fieldacc01 fieldacc01
+ * @compile fieldacc01.java
+ * @run main/othervm/native -agentlib:fieldacc01 fieldacc01
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/fieldacc02.java b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/fieldacc02.java
index ecaf1eb3a8b..f0489ddd83a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/fieldacc02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/fieldacc02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} fieldacc02.java
- * @run main/othervm/native --enable-preview -agentlib:fieldacc02 fieldacc02
+ * @compile fieldacc02.java
+ * @run main/othervm/native -agentlib:fieldacc02 fieldacc02
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/fieldacc03.java b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/fieldacc03.java
index d37ed6701b4..f60684feb3c 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/fieldacc03.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/fieldacc03.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} fieldacc03.java
- * @run main/othervm/native --enable-preview -agentlib:fieldacc03 fieldacc03
+ * @compile fieldacc03.java
+ * @run main/othervm/native -agentlib:fieldacc03 fieldacc03
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/fieldacc04.java b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/fieldacc04.java
index 5b4156e330d..4c0b4abcb7b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/fieldacc04.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/fieldacc04.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} fieldacc04.java
- * @run main/othervm/native --enable-preview -agentlib:fieldacc04 fieldacc04
+ * @compile fieldacc04.java
+ * @run main/othervm/native -agentlib:fieldacc04 fieldacc04
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/fieldmod01.java b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/fieldmod01.java
index 4e7dbefc203..74fbfc6e544 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/fieldmod01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/fieldmod01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
  *
  * @library /test/lib
  * @compile fieldmod01a.jasm
- * @compile --enable-preview -source ${jdk.version} fieldmod01.java
- * @run main/othervm/native --enable-preview -agentlib:fieldmod01 fieldmod01
+ * @compile fieldmod01.java
+ * @run main/othervm/native -agentlib:fieldmod01 fieldmod01
  */
 
 public class fieldmod01 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/fieldmod02.java b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/fieldmod02.java
index dfcf5f8c3d4..20427ba8a74 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/fieldmod02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/fieldmod02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} fieldmod02.java
- * @run main/othervm/native --enable-preview -agentlib:fieldmod02 fieldmod02
+ * @compile fieldmod02.java
+ * @run main/othervm/native -agentlib:fieldmod02 fieldmod02
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/framepop01.java b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/framepop01.java
index bbfd01a4231..5ccc9966675 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/framepop01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/framepop01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} framepop01a.java
- * @run main/othervm/native --enable-preview -agentlib:framepop01 framepop01
+ * @compile framepop01a.java
+ * @run main/othervm/native -agentlib:framepop01 framepop01
  */
 
 public class framepop01 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/framepop02.java b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/framepop02.java
index 494eec241e2..65343953250 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/framepop02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/framepop02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,14 +39,14 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} framepop02.java
- * @run main/othervm/native --enable-preview -agentlib:framepop02 framepop02 platform
+ * @compile framepop02.java
+ * @run main/othervm/native -agentlib:framepop02 framepop02 platform
  */
 /*
  * @test
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} framepop02.java
- * @run main/othervm/native --enable-preview -agentlib:framepop02 framepop02 virtual
+ * @compile framepop02.java
+ * @run main/othervm/native -agentlib:framepop02 framepop02 virtual
  */
 
 public class framepop02 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/mentry01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/mentry01.java
index d0fe9c66fe9..bf36dc22030 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/mentry01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/mentry01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,8 @@
  *     Fixed the 5004632 bug.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} mentry01.java
- * @run main/othervm/native --enable-preview -agentlib:mentry01 mentry01
+ * @compile mentry01.java
+ * @run main/othervm/native -agentlib:mentry01 mentry01
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java
index 1063dfbf068..bcfb682e749 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/mentry02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
  *     Ported from JVMDI test /nsk/regression/b4248826.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} mentry02.java
- * @run main/othervm/native --enable-preview -agentlib:mentry02 mentry02
+ * @compile mentry02.java
+ * @run main/othervm/native -agentlib:mentry02 mentry02
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/mexit01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/mexit01.java
index c3c01500c60..3a309de849e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/mexit01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/mexit01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@
  *
  * @library /test/lib
  * @compile mexit01a.jasm
- * @compile --enable-preview -source ${jdk.version} mexit01.java
- * @run main/othervm/native --enable-preview -agentlib:mexit01 mexit01
+ * @compile mexit01.java
+ * @run main/othervm/native -agentlib:mexit01 mexit01
  */
 
 public class mexit01 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/mexit02.java b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/mexit02.java
index 261f4089911..c86622217b1 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/mexit02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/mexit02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,8 +44,8 @@
  *
  * @library /test/lib
  * @compile mexit02a.jasm
- * @compile --enable-preview -source ${jdk.version} mexit02.java
- * @run main/othervm/native --enable-preview -agentlib:mexit02 mexit02
+ * @compile mexit02.java
+ * @run main/othervm/native -agentlib:mexit02 mexit02
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/mcontenter01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/mcontenter01.java
index 37f95934b0c..a64069ef90b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/mcontenter01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/mcontenter01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,9 +42,9 @@ import jdk.test.lib.jvmti.DebugeeClass;
  *     1000 ms of sleep added to main thread to reduce probability of bad racing.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} mcontenter01.java
- * @run main/othervm/native --enable-preview -agentlib:mcontenter01 mcontenter01 platform
- * @run main/othervm/native --enable-preview -agentlib:mcontenter01 mcontenter01 virtual
+ * @compile mcontenter01.java
+ * @run main/othervm/native -agentlib:mcontenter01 mcontenter01 platform
+ * @run main/othervm/native -agentlib:mcontenter01 mcontenter01 virtual
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/mcontentered01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/mcontentered01.java
index b685b9cb2a0..b6fed60c529 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/mcontentered01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/mcontentered01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,9 +41,9 @@ import jdk.test.lib.jvmti.DebugeeClass;
  *       and save JNIEnv pointer now passed as argument.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} mcontentered01.java
- * @run main/othervm/native --enable-preview -agentlib:mcontentered01 mcontentered01 platform
- * @run main/othervm/native --enable-preview -agentlib:mcontentered01 mcontentered01 virtual
+ * @compile mcontentered01.java
+ * @run main/othervm/native -agentlib:mcontentered01 mcontentered01 platform
+ * @run main/othervm/native -agentlib:mcontentered01 mcontentered01 virtual
  */
 
 public class mcontentered01 extends DebugeeClass {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/monitorwait01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/monitorwait01.java
index 4906ce70b14..1d988340e84 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/monitorwait01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/monitorwait01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,9 +41,9 @@ import jdk.test.lib.jvmti.DebugeeClass;
  *       and save JNIEnv pointer now passed as argument.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} monitorwait01.java
- * @run main/othervm/native --enable-preview -agentlib:monitorwait01 monitorwait01 platform
- * @run main/othervm/native --enable-preview -agentlib:monitorwait01 monitorwait01 virtual
+ * @compile monitorwait01.java
+ * @run main/othervm/native -agentlib:monitorwait01 monitorwait01 platform
+ * @run main/othervm/native -agentlib:monitorwait01 monitorwait01 virtual
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
index 0aacfb298f7..2bdf36df950 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/monitorwaited01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,9 +41,9 @@ import jdk.test.lib.jvmti.DebugeeClass;
  *       and save JNIEnv pointer now passed as argument.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} monitorwaited01.java
- * @run main/othervm/native --enable-preview -agentlib:monitorwaited01 monitorwaited01 platform
- * @run main/othervm/native --enable-preview -agentlib:monitorwaited01 monitorwaited01 virtual
+ * @compile monitorwaited01.java
+ * @run main/othervm/native -agentlib:monitorwaited01 monitorwaited01 platform
+ * @run main/othervm/native -agentlib:monitorwaited01 monitorwaited01 virtual
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/singlestep01.java b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/singlestep01.java
index 17121c8c36e..1978b6fc2c0 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/singlestep01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/singlestep01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@ import java.io.*;
  * COMMENTS
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} singlestep01.java
- * @run main/othervm/native --enable-preview -agentlib:singlestep01 singlestep01
+ * @compile singlestep01.java
+ * @run main/othervm/native -agentlib:singlestep01 singlestep01
  */
 
 public class singlestep01 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/singlestep03.java b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/singlestep03.java
index 925d04a6b0e..5eabbccf7b6 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/singlestep03.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/singlestep03.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,9 @@ import java.io.*;
  * COMMENTS
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} singlestep03.java
- * @run main/othervm/native --enable-preview -agentlib:singlestep03 singlestep03 platform
- * @run main/othervm/native --enable-preview -agentlib:singlestep03 singlestep03 virtual
+ * @compile singlestep03.java
+ * @run main/othervm/native -agentlib:singlestep03 singlestep03 platform
+ * @run main/othervm/native -agentlib:singlestep03 singlestep03 virtual
  */
 
 public class singlestep03 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java
index b70dd858767..8df21101bdf 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
  * @test
  * @summary Verifies JVMTI GetStackTrace functions called without suspend.
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} GetStackTraceNotSuspendedStressTest.java
- * @run main/othervm/native --enable-preview -agentlib:GetStackTraceNotSuspendedStress GetStackTraceNotSuspendedStressTest
+ * @compile GetStackTraceNotSuspendedStressTest.java
+ * @run main/othervm/native -agentlib:GetStackTraceNotSuspendedStress GetStackTraceNotSuspendedStressTest
  */
 
 import jdk.test.lib.jvmti.DebugeeClass;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/GetStackTraceSuspendedStressTest.java b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/GetStackTraceSuspendedStressTest.java
index 93cee3fa4d5..fb0945678db 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/GetStackTraceSuspendedStressTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/GetStackTraceSuspendedStressTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
  * @test
  * @summary Verifies JVMTI GetStackTrace functions called after vthread is suspended.
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} GetStackTraceSuspendedStressTest.java
- * @run main/othervm/native --enable-preview -agentlib:GetStackTraceSuspendedStress GetStackTraceSuspendedStressTest
+ * @compile GetStackTraceSuspendedStressTest.java
+ * @run main/othervm/native -agentlib:GetStackTraceSuspendedStress GetStackTraceSuspendedStressTest
  */
 
 import jdk.test.lib.jvmti.DebugeeClass;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/SetGetThreadLocalStorageStressTest.java b/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/SetGetThreadLocalStorageStressTest.java
index 3a9e7db1fd6..f63b01ae33f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/SetGetThreadLocalStorageStressTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/SetGetThreadLocalStorageStressTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,8 +40,8 @@
  *
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SetGetThreadLocalStorageStressTest.java
- * @run main/othervm/native --enable-preview -agentlib:SetGetThreadLocalStorageStress SetGetThreadLocalStorageStressTest
+ * @compile SetGetThreadLocalStorageStressTest.java
+ * @run main/othervm/native -agentlib:SetGetThreadLocalStorageStress SetGetThreadLocalStorageStressTest
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/allthr01.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/allthr01.java
index 1ee1609439f..29f4b176b52 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/allthr01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/allthr01.java
@@ -38,8 +38,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} allthr01.java
- * @run main/othervm/native --enable-preview -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -agentlib:allthr01 allthr01
+ * @compile allthr01.java
+ * @run main/othervm/native -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -agentlib:allthr01 allthr01
  */
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/contmon01.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/contmon01.java
index 5626449b650..5bc4d4fd2b2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/contmon01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/contmon01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,8 @@
  *       - enhanced descripton
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} contmon01.java
- * @run main/othervm/native --enable-preview -agentlib:contmon01 contmon01
+ * @compile contmon01.java
+ * @run main/othervm/native -agentlib:contmon01 contmon01
  */
 
 public class contmon01 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/contmon02.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/contmon02.java
index 38eba3caccf..28244ceef8e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/contmon02.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/contmon02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@
  *       - enhanced descripton
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} contmon02.java
- * @run main/othervm/native --enable-preview -agentlib:contmon02 contmon02
+ * @compile contmon02.java
+ * @run main/othervm/native -agentlib:contmon02 contmon02
  */
 
 public class contmon02 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java
index 922cad26735..8d757283a30 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,8 +35,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} framecnt01.java
- * @run main/othervm/native --enable-preview -agentlib:framecnt01 framecnt01
+ * @compile framecnt01.java
+ * @run main/othervm/native -agentlib:framecnt01 framecnt01
  */
 
 import java.util.concurrent.locks.LockSupport;
@@ -79,7 +79,7 @@ public class framecnt01 {
         }
 
         // this is too fragile, implementation can change at any time.
-        checkFrames(vThread1, false, 15);
+        checkFrames(vThread1, false, 14);
         LockSupport.unpark(vThread1);
         vThread1.join();
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/GetStackTraceCurrentThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/GetStackTraceCurrentThreadTest.java
index c070f217a31..989d4770d14 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/GetStackTraceCurrentThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/GetStackTraceCurrentThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} GetStackTraceCurrentThreadTest.java
- * @run main/othervm/native --enable-preview -agentlib:GetStackTraceCurrentThreadTest GetStackTraceCurrentThreadTest
+ * @compile GetStackTraceCurrentThreadTest.java
+ * @run main/othervm/native -agentlib:GetStackTraceCurrentThreadTest GetStackTraceCurrentThreadTest
  */
 
 public class GetStackTraceCurrentThreadTest {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java
index c4fba651d71..5669350310f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} getstacktr03.java
- * @run main/othervm/native --enable-preview -agentlib:getstacktr03 getstacktr03
+ * @compile getstacktr03.java
+ * @run main/othervm/native -agentlib:getstacktr03 getstacktr03
  */
 
 public class getstacktr03 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp
index 5272bce8eb0..e14dda91c84 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp
@@ -46,8 +46,7 @@ static frame_info expected_virtual_frames[] = {
     {"Lgetstacktr03$Task;", "run", "()V"},
     {"Ljava/lang/VirtualThread;", "runWith", "(Ljava/lang/Object;Ljava/lang/Runnable;)V"},
     {"Ljava/lang/VirtualThread;", "run", "(Ljava/lang/Runnable;)V"},
-    {"Ljava/lang/VirtualThread$VThreadContinuation;", "lambda$new$0", "(Ljava/lang/VirtualThread;Ljava/lang/Runnable;)V"},
-    {"Ljava/lang/VirtualThread$VThreadContinuation$$Lambda.0x0000000800098810;", "run", "()V"},
+    {"Ljava/lang/VirtualThread$VThreadContinuation$1;", "run", "()V"},
     {"Ljdk/internal/vm/Continuation;", "enter0", "()V"},
     {"Ljdk/internal/vm/Continuation;", "enter", "(Ljdk/internal/vm/Continuation;Z)V"}
 };
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/getstacktr04.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/getstacktr04.java
index 42e8d0aeb6c..45315eb70e4 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/getstacktr04.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/getstacktr04.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} getstacktr04.java
- * @run main/othervm/native --enable-preview -agentlib:getstacktr04 getstacktr04
+ * @compile getstacktr04.java
+ * @run main/othervm/native -agentlib:getstacktr04 getstacktr04
  */
 
 public class getstacktr04 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/getstacktr05.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/getstacktr05.java
index 51f6a7e5877..ad90da6af6d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/getstacktr05.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/getstacktr05.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} getstacktr05.java
- * @run main/othervm/native --enable-preview -agentlib:getstacktr05 getstacktr05
+ * @compile getstacktr05.java
+ * @run main/othervm/native -agentlib:getstacktr05 getstacktr05
  */
 
 public class getstacktr05 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp
index d4d4b2447ab..0cb2992b646 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,7 @@ static frame_info expected_virtual_frames[] = {
     {"Lgetstacktr05$TestThread;", "run", "()V"},
     {"Ljava/lang/VirtualThread;", "runWith", "(Ljava/lang/Object;Ljava/lang/Runnable;)V"},
     {"Ljava/lang/VirtualThread;", "run", "(Ljava/lang/Runnable;)V"},
-    {"Ljava/lang/VirtualThread$VThreadContinuation;", "lambda$new$0", "(Ljava/lang/VirtualThread;Ljava/lang/Runnable;)V"},
-    {"Ljava/lang/VirtualThread$VThreadContinuation$$Lambda;", "run", "()V"},
+    {"Ljava/lang/VirtualThread$VThreadContinuation$1;", "run", "()V"},
     {"Ljdk/internal/vm/Continuation;", "enter0", "()V"},
     {"Ljdk/internal/vm/Continuation;", "enter", "(Ljdk/internal/vm/Continuation;Z)V"},
 };
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/getstacktr06.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/getstacktr06.java
index cbc8fbd4535..82b830fd5d3 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/getstacktr06.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/getstacktr06.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} getstacktr06.java
- * @run main/othervm/native --enable-preview -agentlib:getstacktr06 getstacktr06
+ * @compile getstacktr06.java
+ * @run main/othervm/native -agentlib:getstacktr06 getstacktr06
  */
 
 public class getstacktr06 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/getstacktr07.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/getstacktr07.java
index 18d225d2990..1f091a921c6 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/getstacktr07.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/getstacktr07.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} getstacktr07.java
- * @run main/othervm/native --enable-preview -agentlib:getstacktr07 getstacktr07
+ * @compile getstacktr07.java
+ * @run main/othervm/native -agentlib:getstacktr07 getstacktr07
  */
 
 import java.io.*;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/getstacktr08.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/getstacktr08.java
index eb721da9458..5f7d04a4ea7 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/getstacktr08.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/getstacktr08.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,8 +46,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} getstacktr08.java
- * @run main/othervm/native --enable-preview -agentlib:getstacktr08 getstacktr08
+ * @compile getstacktr08.java
+ * @run main/othervm/native -agentlib:getstacktr08 getstacktr08
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java
index 0f9e2116dc3..1b9dd583f6a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/thrinfo01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} thrinfo01.java
- * @run main/othervm/native --enable-preview -agentlib:thrinfo01 thrinfo01
+ * @compile thrinfo01.java
+ * @run main/othervm/native -agentlib:thrinfo01 thrinfo01
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/thrstat01.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/thrstat01.java
index d2e88b51a06..98cfbea7e15 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/thrstat01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/thrstat01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,8 +73,8 @@
  *       - enhanced descripton
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} thrstat01.java
- * @run main/othervm/native --enable-preview -agentlib:thrstat01 thrstat01
+ * @compile thrstat01.java
+ * @run main/othervm/native -agentlib:thrstat01 thrstat01
  */
 
 public class thrstat01 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/thrstat03.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/thrstat03.java
index 935dd5f9afd..59df3c79b32 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/thrstat03.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/thrstat03.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@
  *     Ported from JVMDI.
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} thrstat03.java
- * @run main/othervm/native --enable-preview  -agentlib:thrstat03 thrstat03 5
+ * @compile thrstat03.java
+ * @run main/othervm/native  -agentlib:thrstat03 thrstat03 5
  */
 
 public class thrstat03 {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/thrstat05.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/thrstat05.java
index 9df7ed950ee..7763cf1a481 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/thrstat05.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/thrstat05.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,8 @@
  * COMMENTS
  *
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} thrstat05.java
- * @run main/othervm/native --enable-preview -agentlib:thrstat05 thrstat05
+ * @compile thrstat05.java
+ * @run main/othervm/native -agentlib:thrstat05 thrstat05
  */
 
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java
index 093b8653f69..e1ce4e3d902 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/BoundVThreadTest.java
@@ -24,7 +24,6 @@
 /**
  * @test
  * @summary Verifies correct JVMTI behavior for BoundVirtualThreads.
- * @enablePreview
  * @run main/othervm/native -agentlib:BoundVThreadTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations BoundVThreadTest
  */
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/BreakpointInYieldTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/BreakpointInYieldTest.java
index b131c742171..452809eb547 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/BreakpointInYieldTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/BreakpointInYieldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
  * @test
  * @summary Verifies that JVMTI function return correct info in Breakpoint events in Continuation.yield0().
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} BreakpointInYieldTest.java
- * @run main/othervm/native --enable-preview -agentlib:BreakpointInYieldTest -Djdk.defaultScheduler.parallelism=2 BreakpointInYieldTest
+ * @compile BreakpointInYieldTest.java
+ * @run main/othervm/native -agentlib:BreakpointInYieldTest -Djdk.defaultScheduler.parallelism=2 BreakpointInYieldTest
  */
 
 import java.util.concurrent.*;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/ContFramePopTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/ContFramePopTest.java
index f40a63c26fb..22143d7ae32 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/ContFramePopTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/ContFramePopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @requires vm.continuations
  * @compile ContFramePopTest.java
  * @modules java.base/jdk.internal.vm
- * @run main/othervm/native --enable-preview -agentlib:ContFramePopTest ContFramePopTest
+ * @run main/othervm/native -agentlib:ContFramePopTest ContFramePopTest
  */
 
 import jdk.internal.vm.Continuation;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java
index fbaf4c98980..59ae2c09cae 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/ContStackDepthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @requires vm.continuations
  * @compile ContStackDepthTest.java
  * @modules java.base/jdk.internal.vm
- * @run main/othervm/native --enable-preview -agentlib:ContStackDepthTest ContStackDepthTest
+ * @run main/othervm/native -agentlib:ContStackDepthTest ContStackDepthTest
  */
 
 import java.math.BigInteger;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/ContYieldBreakPointTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/ContYieldBreakPointTest.java
index eec61dcfea4..5990b267a12 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/ContYieldBreakPointTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/ContYieldBreakPointTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @requires vm.continuations
  * @compile ContYieldBreakPointTest.java
  * @modules java.base/jdk.internal.vm
- * @run main/othervm/native --enable-preview -agentlib:ContYieldBreakPointTest ContYieldBreakPointTest
+ * @run main/othervm/native -agentlib:ContYieldBreakPointTest ContYieldBreakPointTest
  */
 
 import jdk.internal.vm.Continuation;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java
index af28ca12261..bd7626e7a7e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/ContinuationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @requires vm.continuations
  * @compile ContinuationTest.java
  * @modules java.base/jdk.internal.vm
- * @run main/othervm/native --enable-preview -agentlib:ContinuationTest ContinuationTest
+ * @run main/othervm/native -agentlib:ContinuationTest ContinuationTest
  */
 
 import jdk.internal.vm.Continuation;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/GetSetLocalTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/GetSetLocalTest.java
index 57acce70046..a274d8bb4b8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/GetSetLocalTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/GetSetLocalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
  * @summary Verifies JVMTI GetLocalXXX/SetLocalXXX support for virtual threads.
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} GetSetLocalTest.java
- * @run main/othervm/native --enable-preview -agentlib:GetSetLocalTest GetSetLocalTest
+ * @compile GetSetLocalTest.java
+ * @run main/othervm/native -agentlib:GetSetLocalTest GetSetLocalTest
  */
 
 import java.util.concurrent.*;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/InterruptThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/InterruptThreadTest.java
index 826512dfd61..a236d3139c9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/InterruptThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/InterruptThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,15 @@
 /*
  * @test id=default
  * @summary Verifies JVMTI InterruptThread works for virtual threads.
- * @compile --enable-preview -source ${jdk.version} InterruptThreadTest.java
- * @run main/othervm/native --enable-preview -agentlib:InterruptThreadTest InterruptThreadTest
+ * @compile InterruptThreadTest.java
+ * @run main/othervm/native -agentlib:InterruptThreadTest InterruptThreadTest
  */
 
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} InterruptThreadTest.java
- * @run main/othervm/native --enable-preview -agentlib:InterruptThreadTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations InterruptThreadTest
+ * @compile InterruptThreadTest.java
+ * @run main/othervm/native -agentlib:InterruptThreadTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations InterruptThreadTest
  */
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/MethodExitTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/MethodExitTest.java
index 0d48def8755..e1d22111b7b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/MethodExitTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/MethodExitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
  * @test
  * @summary Verifies that MethodExit events are delivered on both carrier and virtual threads.
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} MethodExitTest.java
- * @run main/othervm/native --enable-preview -agentlib:MethodExitTest -Djdk.defaultScheduler.parallelism=2 MethodExitTest 150
+ * @compile MethodExitTest.java
+ * @run main/othervm/native -agentlib:MethodExitTest -Djdk.defaultScheduler.parallelism=2 MethodExitTest 150
  */
 
 import java.util.concurrent.*;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/NullAsCurrentThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/NullAsCurrentThreadTest.java
index f658a6e519b..aa65eb66d10 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/NullAsCurrentThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/NullAsCurrentThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,15 @@
 /*
  * @test id=default
  * @summary Verifies specific JVMTI functions work with current virtual thread passed as NULL.
- * @compile --enable-preview -source ${jdk.version} NullAsCurrentThreadTest.java
- * @run main/othervm/native --enable-preview -agentlib:NullAsCurrentThreadTest=EnableVirtualThreadSupport NullAsCurrentThreadTest
+ * @compile NullAsCurrentThreadTest.java
+ * @run main/othervm/native -agentlib:NullAsCurrentThreadTest=EnableVirtualThreadSupport NullAsCurrentThreadTest
  */
 
 /**
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} NullAsCurrentThreadTest.java
- * @run main/othervm/native --enable-preview -agentlib:NullAsCurrentThreadTest=EnableVirtualThreadSupport -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations NullAsCurrentThreadTest
+ * @compile NullAsCurrentThreadTest.java
+ * @run main/othervm/native -agentlib:NullAsCurrentThreadTest=EnableVirtualThreadSupport -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations NullAsCurrentThreadTest
  */
 
 public class NullAsCurrentThreadTest {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/PinnedTaskTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/PinnedTaskTest.java
index 69980190954..2406f8b7dd1 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/PinnedTaskTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/PinnedTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,15 @@
 /*
  * @test id=default
  * @summary Verifies JVMTI hadles pinned virtual threads correctly.
- * @compile --enable-preview -source ${jdk.version} PinnedTaskTest.java
- * @run main/othervm/native --enable-preview -agentlib:PinnedTaskTest PinnedTaskTest
+ * @compile PinnedTaskTest.java
+ * @run main/othervm/native -agentlib:PinnedTaskTest PinnedTaskTest
  */
 
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} PinnedTaskTest.java
- * @run main/othervm/native --enable-preview -agentlib:PinnedTaskTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations PinnedTaskTest
+ * @compile PinnedTaskTest.java
+ * @run main/othervm/native -agentlib:PinnedTaskTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations PinnedTaskTest
  */
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/RawMonitorTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/RawMonitorTest.java
index 5022edd3bc9..664cb175926 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/RawMonitorTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/RawMonitorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
  * @test
  * @summary Verifies JVMTI RawMoitor functions works correctly on virtual threads
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} RawMonitorTest.java
- * @run main/othervm/native --enable-preview -agentlib:RawMonitorTest RawMonitorTest
+ * @compile RawMonitorTest.java
+ * @run main/othervm/native -agentlib:RawMonitorTest RawMonitorTest
  */
 
 import java.util.List;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/RedefineClasses/RedefineRunningMethods.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/RedefineClasses/RedefineRunningMethods.java
index a8b19b95a6f..047433edba9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/RedefineClasses/RedefineRunningMethods.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/RedefineClasses/RedefineRunningMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  *          jdk.jartool/sun.tools.jar
  * @build jdk.test.lib.helpers.ClassFileInstaller jdk.test.lib.compiler.InMemoryJavaCompiler
  * @run main RedefineClassHelper
- * @run main/othervm/timeout=180 -Xint --enable-preview -javaagent:redefineagent.jar
+ * @run main/othervm/timeout=180 -Xint -javaagent:redefineagent.jar
  *     -Xlog:redefine+class+iklass+add=trace,redefine+class+iklass+purge=trace,class+loader+data=debug,safepoint+cleanup,gc+phases=debug:rt.log
  *     RedefineRunningMethods
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
index 9444bb5dc5f..5af6b1e7322 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,16 @@
  * @test id=default
  * @summary Test verifies that selfsuspend doesn' block unmount by VTMTDisabler
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SelfSuspendDisablerTest.java
- * @run main/othervm/native --enable-preview -agentlib:SelfSuspendDisablerTest SelfSuspendDisablerTest
+ * @compile SelfSuspendDisablerTest.java
+ * @run main/othervm/native -agentlib:SelfSuspendDisablerTest SelfSuspendDisablerTest
  */
 
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SelfSuspendDisablerTest.java
- * @run main/othervm/native --enable-preview -agentlib:SelfSuspendDisablerTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations SelfSuspendDisablerTest
+ * @compile SelfSuspendDisablerTest.java
+ * @run main/othervm/native -agentlib:SelfSuspendDisablerTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations SelfSuspendDisablerTest
  */
 
 public class SelfSuspendDisablerTest {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
index 7f731ab6966..a3fb80a4ec1 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,9 @@
  * @summary Test SuspendThread/ResumeThread, SuspendThreadList/ResumeThreadList
  *          for virtual threads.
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SuspendResume1.java
+ * @compile SuspendResume1.java
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native/timeout=600
- *      --enable-preview
  *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
  *      -agentlib:SuspendResume1
  *      SuspendResume1
@@ -39,10 +38,9 @@
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SuspendResume1.java
+ * @compile SuspendResume1.java
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native/timeout=600
- *      --enable-preview
  *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
  *      -agentlib:SuspendResume1
  *      -XX:+UnlockExperimentalVMOptions
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
index 62d5e3db768..5d3dceff83f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
  * @test id=default
  * @summary Test SuspendAllVirtualThreads/ResumeAllVirtualThreads
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SuspendResume2.java
+ * @compile SuspendResume2.java
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
- *      --enable-preview
  *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
  *      -agentlib:SuspendResume2
  *      SuspendResume2
@@ -38,10 +37,9 @@
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SuspendResume2.java
+ * @compile SuspendResume2.java
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
- *      --enable-preview
  *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
  *      -agentlib:SuspendResume2
  *      -XX:+UnlockExperimentalVMOptions
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
index 22905d23f18..2e3ac4736fd 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
  * @test id=default
  * @summary Test SuspendAllVirtualThreads/ResumeAllVirtualThreads
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SuspendResumeAll.java
+ * @compile SuspendResumeAll.java
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
- *      --enable-preview
  *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
  *      -agentlib:SuspendResumeAll
  *      SuspendResumeAll
@@ -38,10 +37,9 @@
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} SuspendResumeAll.java
+ * @compile SuspendResumeAll.java
  * @run driver jdk.test.lib.FileInstaller . .
  * @run main/othervm/native
- *      --enable-preview
  *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
  *      -agentlib:SuspendResumeAll
  *      -XX:+UnlockExperimentalVMOptions
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
index 54ca603cc50..77f53f051d6 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/VThreadMonitorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
  * @test
  * @summary Test JVMTI Monitor functions for virtual threads
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} VThreadMonitorTest.java
- * @run main/othervm/native --enable-preview -agentlib:VThreadMonitorTest VThreadMonitorTest
+ * @compile VThreadMonitorTest.java
+ * @run main/othervm/native -agentlib:VThreadMonitorTest VThreadMonitorTest
  */
 
 import java.io.PrintStream;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java
index 408b9d30ad2..314434cabf9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test id=default
  * @bug 8284161 8288214
  * @summary Verifies that FRAME_POP event is delivered when called from URL.openStream().
- * @enablePreview
  * @modules jdk.httpserver
  * @library /test/lib
  * @run main/othervm/native
@@ -37,7 +36,6 @@
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @enablePreview
  * @modules jdk.httpserver
  * @library /test/lib
  * @run main/othervm/native
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java
index ebf415ea75e..6b65f0d7574 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
  * @test
  * @summary Verifies JVMTI support for VThreads.
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} VThreadTest.java
- * @run main/othervm/native --enable-preview -agentlib:VThreadTest VThreadTest
+ * @compile VThreadTest.java
+ * @run main/othervm/native -agentlib:VThreadTest VThreadTest
  */
 
 import java.util.concurrent.*;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java
index 41eb6af471f..2e4a1252649 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/VThreadUnsupportedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
  * @test
  * @summary Verifies that specific JVMTI functions returns JVMTI_ERROR_INVALID_THREAD if called with virtual threads.
  * @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} VThreadUnsupportedTest.java
- * @run main/othervm/native --enable-preview -agentlib:VThreadUnsupportedTest VThreadUnsupportedTest
+ * @compile VThreadUnsupportedTest.java
+ * @run main/othervm/native -agentlib:VThreadUnsupportedTest VThreadUnsupportedTest
  */
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/VirtualStackTraceTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/VirtualStackTraceTest.java
index ef679df351f..a7aeed106e5 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/VirtualStackTraceTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/VirtualStackTraceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test id=default
  * @summary Verifies JVMTI GetStackTrace does not truncate virtual thread stack trace with agent attach
  * @requires vm.jvmti
- * @enablePreview
  * @run main/othervm/native -Djdk.attach.allowAttachSelf=true VirtualStackTraceTest
  */
 
@@ -33,7 +32,6 @@
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @requires vm.jvmti
- * @enablePreview
  * @run main/othervm/native -Djdk.attach.allowAttachSelf=true -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations VirtualStackTraceTest
  */
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/VirtualThreadStartTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/VirtualThreadStartTest.java
index 16bf8360c74..79a6187a15c 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/VirtualThreadStartTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/VirtualThreadStartTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test id=default
  * @summary Verifies JVMTI can_support_virtual_threads works for agents loaded at startup and into running VM
  * @requires vm.jvmti
- * @enablePreview
  * @run main/othervm/native -agentlib:VirtualThreadStartTest VirtualThreadStartTest
  * @run main/othervm/native -agentlib:VirtualThreadStartTest=can_support_virtual_threads VirtualThreadStartTest
  * @run main/othervm/native -Djdk.attach.allowAttachSelf=true VirtualThreadStartTest attach
@@ -35,7 +34,6 @@
  * @test id=no-vmcontinuations
  * @requires vm.continuations
  * @requires vm.jvmti
- * @enablePreview
  * @run main/othervm/native -agentlib:VirtualThreadStartTest -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations VirtualThreadStartTest
  * @run main/othervm/native -agentlib:VirtualThreadStartTest=can_support_virtual_threads -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations VirtualThreadStartTest
  * @run main/othervm/native -Djdk.attach.allowAttachSelf=true -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations VirtualThreadStartTest attach
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java
index 318626f2d04..341890ba4a0 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/WaitNotifySuspendedVThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,9 +41,8 @@
  *
  * @requires vm.continuations
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} WaitNotifySuspendedVThreadTest.java
+ * @compile WaitNotifySuspendedVThreadTest.java
  * @run main/othervm/native
- *     --enable-preview
  *     -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
  *     -agentlib:WaitNotifySuspendedVThread WaitNotifySuspendedVThreadTest
  */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/premain/AgentWithVThreadTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/premain/AgentWithVThreadTest.java
index 0e035ffd8b9..4e0db40d1b9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/premain/AgentWithVThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/premain/AgentWithVThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ import jdk.test.lib.process.ProcessTools;
  * @summary Test verifies that virtual threads can be executed in premain()
  * @requires vm.jvmti
  * @library /test/lib
- * @compile --enable-preview -source ${jdk.version} AgentWithVThread.java AgentWithVThreadTest.java
+ * @compile AgentWithVThread.java AgentWithVThreadTest.java
  * @run driver jdk.test.lib.util.JavaAgentBuilder AgentWithVThread agent.jar
  * @run driver jdk.test.lib.helpers.ClassFileInstaller AgentWithVThread
  * @run driver AgentWithVThreadTest
@@ -37,7 +37,7 @@ import jdk.test.lib.process.ProcessTools;
 public class AgentWithVThreadTest {
     public static void main(String[] args) throws Exception  {
 
-        ProcessBuilder pb = ProcessTools.createTestJvm("--enable-preview", "-javaagent:agent.jar",  "-version");
+        ProcessBuilder pb = ProcessTools.createTestJvm("-javaagent:agent.jar",  "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.stdoutShouldContain("passed");
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine.java
index be70c1b44e9..1192de03f88 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -199,16 +199,7 @@ public class StressRedefine extends GCTestBase {
     }
 
     private static ThreadFactory virtualThreadFactory() {
-        try {
-            Object builder = Thread.class.getMethod("ofVirtual").invoke(null);
-            Class<?> clazz = Class.forName("java.lang.Thread$Builder");
-            java.lang.reflect.Method factory = clazz.getMethod("factory");
-            return (ThreadFactory) factory.invoke(builder);
-        } catch (RuntimeException | Error e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        return Thread.ofVirtual().factory();
     }
 
     private static byte[] generateAndCompile() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineVirtual/StressRedefineVirtual.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineVirtual/StressRedefineVirtual.java
index 5e8f76bcc42..fda2cd2daad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineVirtual/StressRedefineVirtual.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineVirtual/StressRedefineVirtual.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
  *          /test/lib
  * @build nsk.jvmti.RedefineClasses.StressRedefine
  * @run main/othervm/native ExecDriver --java
- *      --enable-preview
  *      -agentlib:stressRedefine
  *      nsk.jvmti.RedefineClasses.StressRedefine
  *      ./bin
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java b/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java
index 194ce190a9e..fbdc0a07abf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,16 +78,7 @@ public final class MainWrapper {
     }
 
     static Thread unstartedVirtualThread(Runnable task) {
-        try {
-            Object builder = Thread.class.getMethod("ofVirtual").invoke(null);
-            Class<?> clazz = Class.forName("java.lang.Thread$Builder");
-            Method unstarted = clazz.getMethod("unstarted", Runnable.class);
-            return (Thread) unstarted.invoke(builder, task);
-        } catch (RuntimeException | Error e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        return Thread.ofVirtual().unstarted(task);
     }
 
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
index 44e2c6a98c0..28aa1972cb4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,8 +165,6 @@ public class Launcher extends DebugeeBinder {
         if (argumentHandler.isLaunchingConnector()) {
             boolean vthreadMode = "Virtual".equals(System.getProperty("main.wrapper"));
             if (vthreadMode) {
-                /* Need --enable-preview on the debuggee in order to support virtual threads. */
-                args.add("-R--enable-preview");
                 /* Some tests need more carrier threads than the default provided. */
                 args.add("-R-Djdk.virtualThreadScheduler.parallelism=15");
             }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
index 04725a24559..59e57eff965 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -753,8 +753,6 @@ public class Binder extends DebugeeBinder {
 
         boolean vthreadMode = "Virtual".equals(System.getProperty("main.wrapper"));
         if (vthreadMode) {
-            /* Need --enable-preview on the debuggee in order to support virtual threads. */
-            vmArgs += " --enable-preview";
             /* Some tests need more carrier threads than the default provided. */
             vmArgs += " -Djdk.virtualThreadScheduler.parallelism=15";
         }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIThreadFactory.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIThreadFactory.java
index f8bc0cb8f9c..08b36dd55a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIThreadFactory.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,15 +53,6 @@ public class JDIThreadFactory {
     }
 
     private static ThreadFactory virtualThreadFactory() {
-        try {
-            Object builder = Thread.class.getMethod("ofVirtual").invoke(null);
-            Class<?> clazz = Class.forName("java.lang.Thread$Builder");
-            java.lang.reflect.Method factory = clazz.getMethod("factory");
-            return (ThreadFactory) factory.invoke(builder);
-        } catch (RuntimeException | Error e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        return Thread.ofVirtual().factory();
     }
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeBinder.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeBinder.java
index 6d38fcf1654..61354b2e6e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeBinder.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -313,12 +313,6 @@ public class DebugeeBinder extends Log.Logger implements Finalizable {
 
         args.add(argumentHandler.getLaunchExecPath());
 
-        /* Need --enable-preview on the debuggee in order to support virtual threads. */
-        boolean vthreadMode = "Virtual".equals(System.getProperty("main.wrapper"));
-        if (vthreadMode) {
-            args.add("--enable-preview");
-        }
-
         String javaOpts = argumentHandler.getLaunchOptions();
         if (javaOpts != null && javaOpts.length() > 0) {
             StringTokenizer st = new StringTokenizer(javaOpts);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java b/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java
index 217c4bc29f4..0401fea13fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/runner/ThreadsRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,16 +86,7 @@ public class ThreadsRunner implements MultiRunner, LogAware, RunParamsAware {
         }
 
         private Thread unstartedVirtualThread(Runnable task) {
-            try {
-                Object builder = Thread.class.getMethod("ofVirtual").invoke(null);
-                Class<?> clazz = Class.forName("java.lang.Thread$Builder");
-                java.lang.reflect.Method unstarted = clazz.getMethod("unstarted", Runnable.class);
-                return (Thread) unstarted.invoke(builder, task);
-            } catch (RuntimeException | Error e) {
-                throw e;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+            return Thread.ofVirtual().unstarted(task);
         }
 
     }
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index f96bf1b0c02..a0447aae7d7 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -270,7 +270,8 @@ jdk_launcher = \
     sun/tools
 
 jdk_loom = \
-    com/sun/management/HotSpotDiagnosticMXBean/ \
+    com/sun/management/HotSpotDiagnosticMXBean \
+    com/sun/management/ThreadMXBean \
     java/lang/Thread \
     java/lang/ThreadGroup \
     java/lang/management/ThreadMXBean \
diff --git a/test/jdk/com/sun/jdi/SuspendAfterDeath.java b/test/jdk/com/sun/jdi/SuspendAfterDeath.java
index be0b901e500..652405a94bb 100644
--- a/test/jdk/com/sun/jdi/SuspendAfterDeath.java
+++ b/test/jdk/com/sun/jdi/SuspendAfterDeath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test id=platform_thread
  * @bug 8287847
  * @summary Test suspending a platform thread after it has terminated.
- * @enablePreview
  * @run build TestScaffold VMConnection TargetListener TargetAdapter
  * @run compile SuspendAfterDeath.java
  * @run main/othervm SuspendAfterDeath
@@ -35,7 +34,6 @@
  * @test id=virtual_thread
  * @bug 8287847
  * @summary Test suspending a virtual thread after it has terminated.
- * @enablePreview
  * @run build TestScaffold VMConnection TargetListener TargetAdapter
  * @run compile SuspendAfterDeath.java
  * @run main/othervm SuspendAfterDeath Virtual
diff --git a/test/jdk/com/sun/jdi/TestScaffold.java b/test/jdk/com/sun/jdi/TestScaffold.java
index 8c996bce94d..88523c3d632 100644
--- a/test/jdk/com/sun/jdi/TestScaffold.java
+++ b/test/jdk/com/sun/jdi/TestScaffold.java
@@ -466,7 +466,6 @@ abstract public class TestScaffold extends TargetAdapter {
         String mainWrapper = System.getProperty("main.wrapper");
         if ("Virtual".equals(mainWrapper)) {
             argInfo.targetAppCommandLine = TestScaffold.class.getName() + " " + mainWrapper + " ";
-            argInfo.targetVMArgs += "--enable-preview ";
         } else if ("true".equals(System.getProperty("test.enable.preview"))) {
             // the test specified @enablePreview.
             argInfo.targetVMArgs += "--enable-preview ";
@@ -992,10 +991,10 @@ abstract public class TestScaffold extends TargetAdapter {
         mainMethod.setAccessible(true);
 
         if (wrapper.equals("Virtual")) {
-            threadFactory = r -> newVirtualThread(r);
+            threadFactory = Thread.ofVirtual().factory();
             MainThreadGroup tg = new MainThreadGroup();
             // TODO fix to set virtual scheduler group when become available
-            Thread vthread = newVirtualThread(() -> {
+            Thread vthread = Thread.ofVirtual().unstarted(() -> {
                 try {
                     mainMethod.invoke(null, new Object[] { classArgs });
                 } catch (InvocationTargetException e) {
@@ -1044,20 +1043,6 @@ abstract public class TestScaffold extends TargetAdapter {
         Throwable uncaughtThrowable = null;
     }
 
-    // Need to use reflection while virtual threads --enable-preview feature
-    private static Thread newVirtualThread(Runnable task) {
-        try {
-            Object builder = Thread.class.getMethod("ofVirtual").invoke(null);
-            Class<?> clazz = Class.forName("java.lang.Thread$Builder");
-            java.lang.reflect.Method unstarted = clazz.getMethod("unstarted", Runnable.class);
-            return (Thread) unstarted.invoke(builder, task);
-        } catch (RuntimeException | Error e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     public static Thread newThread(Runnable task) {
         return threadFactory.newThread(task);
     }
diff --git a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java
index 174300af174..c31d27fa9bd 100644
--- a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java
+++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java
@@ -25,7 +25,6 @@
  * @test
  * @bug 8284161 8287008
  * @summary Basic test for com.sun.management.HotSpotDiagnosticMXBean.dumpThreads
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm DumpThreads
  * @run junit/othervm -Djdk.trackAllThreads DumpThreads
diff --git a/test/jdk/com/sun/management/ThreadMXBean/VirtualThreads.java b/test/jdk/com/sun/management/ThreadMXBean/VirtualThreads.java
index d07309c48b2..aacb21477f0 100644
--- a/test/jdk/com/sun/management/ThreadMXBean/VirtualThreads.java
+++ b/test/jdk/com/sun/management/ThreadMXBean/VirtualThreads.java
@@ -25,7 +25,6 @@
  * @test id=default
  * @bug 8284161 8303242
  * @summary Test com.sun.management.ThreadMXBean with virtual threads
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm VirtualThreads
  */
@@ -33,7 +32,6 @@
 /**
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations VirtualThreads
  */
@@ -116,7 +114,11 @@ public class VirtualThreads {
             long tid1 = vthread.threadId();
             long[] tids = new long[] { tid0, tid1 };
             long[] allocated = bean.getThreadAllocatedBytes(tids);
-            assertTrue(allocated[0] >= 0L);
+            if (Thread.currentThread().isVirtual()) {
+                assertEquals(-1L, allocated[0]);
+            } else {
+                assertTrue(allocated[0] >= 0L);
+            }
             assertEquals(-1L, allocated[1]);
         } finally {
             LockSupport.unpark(vthread);
@@ -138,7 +140,11 @@ public class VirtualThreads {
             long tid1 = vthread.threadId();
             long[] tids = new long[] { tid0, tid1 };
             long[] cpuTimes = bean.getThreadCpuTime(tids);
-            assertTrue(cpuTimes[0] >= 0L);
+            if (Thread.currentThread().isVirtual()) {
+                assertEquals(-1L, cpuTimes[0]);
+            } else {
+                assertTrue(cpuTimes[0] >= 0L);
+            }
             assertEquals(-1L, cpuTimes[1]);
         } finally {
             LockSupport.unpark(vthread);
@@ -160,7 +166,11 @@ public class VirtualThreads {
             long tid1 = vthread.threadId();
             long[] tids = new long[] { tid0, tid1 };
             long[] userTimes = bean.getThreadUserTime(tids);
-            assertTrue(userTimes[0] >= 0L);
+            if (Thread.currentThread().isVirtual()) {
+                assertEquals(-1L, userTimes[0]);
+            } else {
+                assertTrue(userTimes[0] >= 0L);
+            }
             assertEquals(-1L, userTimes[1]);
         } finally {
             LockSupport.unpark(vthread);
diff --git a/test/jdk/java/lang/Thread/BuilderTest.java b/test/jdk/java/lang/Thread/BuilderTest.java
index 0aaf247fed6..2c5a6087898 100644
--- a/test/jdk/java/lang/Thread/BuilderTest.java
+++ b/test/jdk/java/lang/Thread/BuilderTest.java
@@ -24,7 +24,6 @@
 /**
  * @test
  * @summary Unit test for Thread.Builder
- * @enablePreview
  * @run junit BuilderTest
  */
 
@@ -573,36 +572,6 @@ class BuilderTest {
         testThreadLocals(builder);
     }
 
-    /**
-     * Test Thread.Builder creating threads that disallow or allow
-     * thread locals.
-     */
-    @Test
-    void testThreadLocals3() throws Exception {
-        Thread.Builder builder = Thread.ofPlatform();
-
-        // disallow
-        builder.allowSetThreadLocals(false);
-        testNoThreadLocals(builder);
-
-        // allow
-        builder.allowSetThreadLocals(true);
-        testThreadLocals(builder);
-    }
-
-    @Test
-    void testThreadLocals4() throws Exception {
-        Thread.Builder builder = Thread.ofVirtual();
-
-        // disallow
-        builder.allowSetThreadLocals(false);
-        testNoThreadLocals(builder);
-
-        // allow
-        builder.allowSetThreadLocals(true);
-        testThreadLocals(builder);
-    }
-
     /**
      * Tests that a builder creates threads that inherits the initial values of
      * inheritable thread locals.
@@ -699,46 +668,6 @@ class BuilderTest {
         testInheritedThreadLocals(builder);
     }
 
-    @Test
-    void testInheritedThreadLocals3() throws Exception {
-        Thread.Builder builder = Thread.ofPlatform();
-
-        // thread locals not allowed
-        builder.allowSetThreadLocals(false);
-        testNoInheritedThreadLocals(builder);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritedThreadLocals(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testNoInheritedThreadLocals(builder);
-
-        // thread locals allowed
-        builder.allowSetThreadLocals(true);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritedThreadLocals(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testInheritedThreadLocals(builder);
-    }
-
-    @Test
-    void testInheritedThreadLocals4() throws Exception {
-        Thread.Builder builder = Thread.ofVirtual();
-
-        // thread locals not allowed
-        builder.allowSetThreadLocals(false);
-        testNoInheritedThreadLocals(builder);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritedThreadLocals(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testNoInheritedThreadLocals(builder);
-
-        // thread locals allowed
-        builder.allowSetThreadLocals(true);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritedThreadLocals(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testInheritedThreadLocals(builder);
-    }
-
     /**
      * Tests a builder creates threads that inherit the context class loader.
      */
@@ -850,46 +779,6 @@ class BuilderTest {
         testInheritContextClassLoader(builder);
     }
 
-    @Test
-    void testContextClassLoader3() throws Exception {
-        Thread.Builder builder = Thread.ofPlatform();
-
-        // thread locals not allowed
-        builder.allowSetThreadLocals(false);
-        testNoInheritContextClassLoader(builder);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritContextClassLoader(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testNoInheritContextClassLoader(builder);
-
-        // thread locals allowed
-        builder.allowSetThreadLocals(true);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritContextClassLoader(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testInheritContextClassLoader(builder);
-    }
-
-    @Test
-    void testContextClassLoader4() throws Exception {
-        Thread.Builder builder = Thread.ofVirtual();
-
-        // thread locals not allowed
-        builder.allowSetThreadLocals(false);
-        testNoInheritContextClassLoader(builder);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritContextClassLoader(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testNoInheritContextClassLoader(builder);
-
-        // thread locals allowed
-        builder.allowSetThreadLocals(true);
-        builder.inheritInheritableThreadLocals(false);
-        testNoInheritContextClassLoader(builder);
-        builder.inheritInheritableThreadLocals(true);
-        testInheritContextClassLoader(builder);
-    }
-
     /**
      * Test NullPointerException.
      */
diff --git a/test/jdk/java/lang/Thread/ThreadSleepEvent.java b/test/jdk/java/lang/Thread/ThreadSleepEvent.java
new file mode 100644
index 00000000000..7aa2f507ff0
--- /dev/null
+++ b/test/jdk/java/lang/Thread/ThreadSleepEvent.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Test that Thread.sleep emits a JFR jdk.ThreadSleep event
+ * @modules jdk.jfr
+ * @run junit ThreadSleepEvent
+ */
+
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadFactory;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
+import static java.util.concurrent.TimeUnit.*;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingFile;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ThreadSleepEvent {
+    private static final String THREAD_SLEEP_EVENT_NAME = "jdk.ThreadSleep";
+
+    static Stream<ThreadFactory> threadFactories() {
+        return Stream.of(
+                Thread.ofPlatform().factory(),
+                Thread.ofVirtual().factory()
+        );
+    }
+
+    // Arguments.of(ThreadFactory, millis)
+    static Stream<Arguments> threadFactoryAndMillis() {
+        long[] millis = {0, 1000, Long.MAX_VALUE};
+        return threadFactories()
+                .flatMap(f -> LongStream.of(millis)
+                        .mapToObj(ms -> Arguments.of(f, ms)));
+    }
+
+    // Arguments.of(ThreadFactory, millis, nanos)
+    static Stream<Arguments> threadFactoryAndMillisAndNanos() {
+        int[] nanos = {0, 1000, 999_999};
+        return threadFactoryAndMillis().flatMap(a -> IntStream.of(nanos)
+                .mapToObj(ns -> Arguments.of(a.get()[0], a.get()[1], ns)));
+    }
+
+    // Arguments.of(ThreadFactory, Duration)
+    static Stream<Arguments> threadFactoryAndDuration() {
+        Duration[] durations = {
+                Duration.ofNanos(0),
+                Duration.ofSeconds(1),
+                Duration.ofSeconds(Long.MAX_VALUE, 999_999_999)
+        };
+        return threadFactories()
+                .flatMap(f -> Stream.of(durations)
+                        .map(d -> Arguments.of(f, d)));
+    }
+
+    /**
+     * Test Thread.sleep(long) emits event.
+     */
+    @ParameterizedTest
+    @MethodSource("threadFactoryAndMillis")
+    void testSleep(ThreadFactory factory, long millis) throws Exception {
+        long expectedTime = MILLISECONDS.toNanos(millis);
+        long recordedTime = testSleep(factory, () -> Thread.sleep(millis));
+        assertEquals(expectedTime, recordedTime);
+    }
+
+    /**
+     * Test Thread.sleep(long, int) emits event.
+     */
+    @ParameterizedTest
+    @MethodSource("threadFactoryAndMillisAndNanos")
+    void testSleep(ThreadFactory factory, long millis, int nanos) throws Exception {
+        long expectedTime = MILLISECONDS.toNanos(millis);
+        expectedTime += Math.min(Long.MAX_VALUE - expectedTime, nanos);
+        long recordedTime = testSleep(factory, () -> Thread.sleep(millis, nanos));
+        assertEquals(expectedTime, recordedTime);
+    }
+
+    /**
+     * Test Thread.sleep(Duration) emits event.
+     */
+    @ParameterizedTest
+    @MethodSource("threadFactoryAndDuration")
+    void testSleep(ThreadFactory factory, Duration duration) throws Exception {
+        long expectedTime = NANOSECONDS.convert(duration);
+        long recordedTime = testSleep(factory, () -> Thread.sleep(duration));
+        assertEquals(expectedTime, recordedTime);
+    }
+
+    /**
+     * Test that sleeper emits event, returning the recorded sleep time.
+     */
+    long testSleep(ThreadFactory factory, Sleeper sleeper) throws Exception {
+        try (Recording recording = new Recording()) {
+            long tid;
+
+            recording.enable(THREAD_SLEEP_EVENT_NAME);
+            recording.start();
+            try {
+
+                // start thread to run sleeper task
+                var latch = new CountDownLatch(1);
+                Thread thread = factory.newThread(() -> {
+                    latch.countDown();
+                    try {
+                        sleeper.run();
+                    } catch (InterruptedException e) {
+                        // ignore;
+                    }
+                });
+                thread.start();
+
+                // wait for thread to execute
+                latch.await();
+
+                // don't wait for the sleep time
+                thread.interrupt();
+
+                thread.join();
+                tid = thread.threadId();
+            } finally {
+                recording.stop();
+            }
+
+            // find the ThreadSleep event recorded by the thread
+            RecordedEvent event = find(recording, THREAD_SLEEP_EVENT_NAME, tid).orElseThrow();
+            return event.getLong("time");
+        }
+    }
+
+    private interface Sleeper {
+        void run() throws InterruptedException;
+    }
+
+    /**
+     * Find a recorded event with the given name and recorded by a thread with the
+     * given thread ID.
+     */
+    private static Optional<RecordedEvent> find(Recording recording,
+                                                String name,
+                                                long tid) throws Exception {
+        Path recordingFile = recordingFile(recording);
+        List<RecordedEvent> events = RecordingFile.readAllEvents(recordingFile);
+        return events.stream()
+                .filter(e -> e.getEventType().getName().equals(name)
+                        && e.getThread().getJavaThreadId() == tid)
+                .findAny();
+    }
+
+    /**
+     * Return the file path to the recording file.
+     */
+    private static Path recordingFile(Recording recording) throws Exception {
+        Path recordingFile = recording.getDestination();
+        if (recordingFile == null) {
+            ProcessHandle h = ProcessHandle.current();
+            recordingFile = Path.of("recording-" + recording.getId() + "-pid" + h.pid() + ".jfr");
+            recording.dump(recordingFile);
+        }
+        return recordingFile;
+    }
+}
diff --git a/test/jdk/java/lang/Thread/ThreadSleepEventThrows.java b/test/jdk/java/lang/Thread/ThreadSleepEventThrows.java
new file mode 100644
index 00000000000..c1f2f59d582
--- /dev/null
+++ b/test/jdk/java/lang/Thread/ThreadSleepEventThrows.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Test Thread.sleep when emitting the JFR jdk.ThreadSleep event throws OOME
+ * @modules java.base/jdk.internal.event
+ * @compile/module=java.base jdk/internal/event/ThreadSleepEvent.java
+ * @run junit ThreadSleepEventThrows
+ */
+
+import jdk.internal.event.ThreadSleepEvent;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ThreadSleepEventThrows {
+
+    /**
+     * Test Thread.sleep when creating the ThreadSleepEvent fails with OOME.
+     */
+    @Test
+    void testThreadSleepEventCreateThrows() throws Exception {
+        ThreadSleepEvent.setCreateThrows(true);
+        try {
+            testSleep();
+        } finally {
+            ThreadSleepEvent.setCreateThrows(false);
+        }
+    }
+
+    /**
+     * Test Thread.sleep when ThreadSleepEvent.begin fails with OOME.
+     */
+    @Test
+    void testThreadSleepEventBeginThrows() throws Exception {
+        ThreadSleepEvent.setBeginThrows(true);
+        try {
+            testSleep();
+        } finally {
+            ThreadSleepEvent.setBeginThrows(false);
+        }
+    }
+
+    /**
+     * Test Thread.sleep when ThreadSleepEvent.commit fails with OOME.
+     */
+    @Test
+    void testThreadSleepEventCommitThrows() throws Exception {
+        ThreadSleepEvent.setCommitThrows(true);
+        try {
+            testSleep();
+        } finally {
+            ThreadSleepEvent.setCommitThrows(false);
+        }
+    }
+
+    /**
+     * Test Thread.sleep takes a minimum duration and doesn't throw.
+     */
+    private void testSleep() throws Exception {
+        long start = currentTimeMillis();
+        Thread.sleep(SLEEP_TIME);
+        long duration = currentTimeMillis() - start;
+        assertTrue(duration >= MIN_EXPECTED_DURATION,
+            "Duration " + duration + "ms, expected >= " + MIN_EXPECTED_DURATION + "ms");
+    }
+
+    private static final int SLEEP_TIME = 2000;
+    private static final int MIN_EXPECTED_DURATION = 1900;
+
+    private static long currentTimeMillis() {
+        return NANOSECONDS.toMillis(System.nanoTime());
+    }
+}
diff --git a/test/jdk/java/lang/Thread/java.base/jdk/internal/event/ThreadSleepEvent.java b/test/jdk/java/lang/Thread/java.base/jdk/internal/event/ThreadSleepEvent.java
new file mode 100644
index 00000000000..ff6bb499559
--- /dev/null
+++ b/test/jdk/java/lang/Thread/java.base/jdk/internal/event/ThreadSleepEvent.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.event;
+
+/**
+ * ThreadSleepEvent to optionally throw OOME at create, begin or commit time.
+ */
+public class ThreadSleepEvent extends Event {
+    private static boolean throwOnCreate;
+    private static boolean throwOnBegin;
+    private static boolean throwOnCommit;
+
+    public long time;
+
+    public static boolean isTurnedOn() {
+        return true;
+    }
+
+    public static void setCreateThrows(boolean value) {
+        throwOnCreate = value;
+    }
+
+    public static void setBeginThrows(boolean value) {
+        throwOnBegin = value;
+    }
+
+    public static void setCommitThrows(boolean value) {
+        throwOnCommit = value;
+    }
+
+    public ThreadSleepEvent() {
+        if (throwOnCreate) {
+            throw new OutOfMemoryError();
+        }
+    }
+
+    @Override
+    public void begin() {
+        if (throwOnBegin) {
+            throw new OutOfMemoryError();
+        }
+    }
+
+    @Override
+    public void commit() {
+        if (throwOnCommit) {
+            throw new OutOfMemoryError();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/ActiviateSpareCarrier.java b/test/jdk/java/lang/Thread/virtual/ActivateSpareCarrier.java
similarity index 96%
rename from test/jdk/java/lang/Thread/virtual/ActiviateSpareCarrier.java
rename to test/jdk/java/lang/Thread/virtual/ActivateSpareCarrier.java
index c97b63bef67..3ffda23082c 100644
--- a/test/jdk/java/lang/Thread/virtual/ActiviateSpareCarrier.java
+++ b/test/jdk/java/lang/Thread/virtual/ActivateSpareCarrier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,9 @@
  *   carrier thread (cT1) and doesn't activate a spare. Subsequent blocking operations
  *   that pin a virtual thread to cT1 should attempt to activate a spare.
  * @requires vm.continuations
- * @enablePreview
  * @run main/othervm
  *     -Djdk.virtualThreadScheduler.parallelism=1
- *     -Djdk.virtualThreadScheduler.maxPoolSize=2 ActiviateSpareCarrier 100
+ *     -Djdk.virtualThreadScheduler.maxPoolSize=2 ActivateSpareCarrier 100
  */
 
 import java.time.Duration;
@@ -40,7 +39,7 @@ import java.util.List;
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.stream.Collectors;
 
-public class ActiviateSpareCarrier {
+public class ActivateSpareCarrier {
 
     private static final int DEFAULT_ITERTAIONS = 10_000;
 
diff --git a/test/jdk/java/lang/Thread/virtual/Collectable.java b/test/jdk/java/lang/Thread/virtual/Collectable.java
index 9003c0d6fa0..f63203d2f48 100644
--- a/test/jdk/java/lang/Thread/virtual/Collectable.java
+++ b/test/jdk/java/lang/Thread/virtual/Collectable.java
@@ -24,7 +24,6 @@
 /**
  * @test
  * @summary Test that virtual threads are GC'ed
- * @enablePreview
  * @run junit Collectable
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/CustomScheduler.java b/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
index edd6924bb30..6d4e029f280 100644
--- a/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
+++ b/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
@@ -26,7 +26,6 @@
  * @summary Test virtual threads using a custom scheduler
  * @requires vm.continuations
  * @modules java.base/java.lang:+open
- * @enablePreview
  * @run junit CustomScheduler
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/GetStackTrace.java b/test/jdk/java/lang/Thread/virtual/GetStackTrace.java
index f8e1f1d816c..86d5cf7319c 100644
--- a/test/jdk/java/lang/Thread/virtual/GetStackTrace.java
+++ b/test/jdk/java/lang/Thread/virtual/GetStackTrace.java
@@ -26,7 +26,6 @@
  * @summary Test Thread.getStackTrace to examine the stack trace of a virtual
  *     thread and its carrier
  * @requires vm.continuations
- * @enablePreview
  * @modules java.base/java.lang:+open
  * @run main GetStackTrace
  */
@@ -57,11 +56,11 @@ public class GetStackTrace {
                     Thread.sleep(10);
                 }
 
-                // bottom-most frame of virtual thread should be Continuation.enter
+                // bottom-most frame of virtual thread should be VirtualThread.run
                 System.out.println(vthread);
                 StackTraceElement[] vthreadStack = vthread.getStackTrace();
                 Stream.of(vthreadStack).forEach(System.out::println);
-                assertEquals("enter", vthreadStack[vthreadStack.length - 1].getMethodName());
+                assertEquals("run", vthreadStack[vthreadStack.length - 1].getMethodName());
 
                 System.out.println();
 
diff --git a/test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java b/test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java
index 97360703d47..4cf7deecb36 100644
--- a/test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java
+++ b/test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @summary Test Thread::getStackTrace on a virtual thread that is runnable-unmounted
  * @requires vm.continuations
- * @enablePreview
  * @run main/othervm -Djdk.virtualThreadScheduler.maxPoolSize=1 GetStackTraceWhenRunnable
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/HoldsLock.java b/test/jdk/java/lang/Thread/virtual/HoldsLock.java
index 80da73504b0..7878502373a 100644
--- a/test/jdk/java/lang/Thread/virtual/HoldsLock.java
+++ b/test/jdk/java/lang/Thread/virtual/HoldsLock.java
@@ -26,7 +26,6 @@
  * @summary Test Thread.holdsLock when lock held by carrier thread
  * @requires vm.continuations
  * @modules java.base/java.lang:+open
- * @enablePreview
  * @run junit HoldsLock
  */
 
@@ -35,7 +34,6 @@
  * @summary Test Thread.holdsLock when lock held by carrier thread
  * @requires vm.continuations & vm.debug
  * @modules java.base/java.lang:+open
- * @enablePreview
  * @run junit/othervm -XX:+UseHeavyMonitors HoldsLock
  */
 
@@ -55,6 +53,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Disabled;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 
 class HoldsLock {
     static final Object LOCK1 = new Object();
@@ -88,6 +87,8 @@ class HoldsLock {
 
     @Test
     void testThreadInfo() throws Exception {
+        assumeFalse(Thread.currentThread().isVirtual(), "Main thread must be platform thread");
+
         var q = new ArrayBlockingQueue<Runnable>(5);
 
         Thread carrier = spawnCarrier(q);
diff --git a/test/jdk/java/lang/Thread/virtual/JfrEvents.java b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
index 72afb229cb3..9ff9c2f86e2 100644
--- a/test/jdk/java/lang/Thread/virtual/JfrEvents.java
+++ b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
@@ -26,7 +26,6 @@
  * @summary Basic test for JFR jdk.VirtualThreadXXX events
  * @requires vm.continuations
  * @modules jdk.jfr java.base/java.lang:+open
- * @enablePreview
  * @run junit/othervm JfrEvents
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/Locking.java b/test/jdk/java/lang/Thread/virtual/Locking.java
index e70ee867f5e..341e5fb2d08 100644
--- a/test/jdk/java/lang/Thread/virtual/Locking.java
+++ b/test/jdk/java/lang/Thread/virtual/Locking.java
@@ -25,7 +25,6 @@
  * @test
  * @summary Test virtual threads using java.util.concurrent locks
  * @library /test/lib
- * @enablePreview
  * @run junit Locking
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java b/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java
index b54135d9cc7..950f036458d 100644
--- a/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java
+++ b/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java
@@ -26,7 +26,6 @@
  * @summary Test virtual thread park when scheduler is a fixed thread pool
  * @requires vm.continuations
  * @modules java.base/java.lang:+open
- * @enablePreview
  * @run main ParkWithFixedThreadPool
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/Parking.java b/test/jdk/java/lang/Thread/virtual/Parking.java
index b4f70232ce1..674f14744a6 100644
--- a/test/jdk/java/lang/Thread/virtual/Parking.java
+++ b/test/jdk/java/lang/Thread/virtual/Parking.java
@@ -25,7 +25,6 @@
  * @test
  * @summary Test virtual threads using park/unpark
  * @library /test/lib
- * @enablePreview
  * @run junit Parking
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/PreviewFeaturesNotEnabled.java b/test/jdk/java/lang/Thread/virtual/PreviewFeaturesNotEnabled.java
deleted file mode 100644
index 083322e9904..00000000000
--- a/test/jdk/java/lang/Thread/virtual/PreviewFeaturesNotEnabled.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Test that preview APIs throws exception when preview features not enabled
- * @run junit/othervm PreviewFeaturesNotEnabled
- */
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.Executors;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class PreviewFeaturesNotEnabled {
-
-    /**
-     * Thread.ofVirtual should fail with UOE.
-     */
-    @Test
-    void testOfVirtual() throws Exception {
-        Method ofVirtual = Thread.class.getDeclaredMethod("ofVirtual");
-        var exc = assertThrows(InvocationTargetException.class, () -> ofVirtual.invoke(null));
-        assertTrue(exc.getCause() instanceof UnsupportedOperationException);
-    }
-
-    /**
-     * Thread.startVirtualThread should fail with UOE.
-     */
-    @Test
-    void testStartVirutalThread() throws Exception {
-        Method startVirtualThread = Thread.class.getMethod("startVirtualThread", Runnable.class);
-        Runnable task = () -> { };
-        var exc = assertThrows(InvocationTargetException.class,
-                () -> startVirtualThread.invoke(null, task));
-        assertTrue(exc.getCause() instanceof UnsupportedOperationException);
-    }
-
-    /**
-     * Executors.newVirtualThreadPerTaskExecutor should fail with UOE.
-     */
-    @Test
-    void testNewVirtualThreadPerTaskExecutor() throws Exception {
-        Method newVirtualThreadPerTaskExecutor = Executors.class.getMethod("newVirtualThreadPerTaskExecutor");
-        var exc = assertThrows(InvocationTargetException.class,
-                () -> newVirtualThreadPerTaskExecutor.invoke(null));
-        assertTrue(exc.getCause() instanceof UnsupportedOperationException);
-    }
-
-    /**
-     * Directly accessing internal Continuation class should fail with UOE.
-     */
-    @Test
-    void testContinuationInitializer() throws Exception {
-        var exc = assertThrows(ExceptionInInitializerError.class,
-                () -> Class.forName("jdk.internal.vm.Continuation"));
-        assertTrue(exc.getCause() instanceof UnsupportedOperationException);
-    }
-
-    /**
-     * Thread.isVirtual should not fail.
-     */
-    @Test
-    void testIsVirtual() throws Exception {
-        boolean isVirtual = isVirtual(Thread.currentThread());
-        assertFalse(isVirtual);
-    }
-
-    /**
-     * Thread.ofPlatform should not fail.
-     */
-    @Test
-    void testOfPlatform() throws Exception {
-        Method ofPlatform = Thread.class.getDeclaredMethod("ofPlatform");
-        Object builder = ofPlatform.invoke(null);
-        Method startMethod = Class.forName("java.lang.Thread$Builder")
-                .getMethod("start", Runnable.class);
-        Runnable task = () -> { };
-        Thread thread = (Thread) startMethod.invoke(builder, task);
-    }
-
-    /**
-     * Invokes Thread::isVirtual reflectively to test if the given thread is a
-     * virtual thread.
-     */
-    private static boolean isVirtual(Thread thread) throws Exception {
-        Method isVirtualMethod = Thread.class.getDeclaredMethod("isVirtual");
-        return (boolean) isVirtualMethod.invoke(thread);
-    }
-}
diff --git a/test/jdk/java/lang/Thread/virtual/Reflection.java b/test/jdk/java/lang/Thread/virtual/Reflection.java
index 23dcfb796b2..bfca37a5e43 100644
--- a/test/jdk/java/lang/Thread/virtual/Reflection.java
+++ b/test/jdk/java/lang/Thread/virtual/Reflection.java
@@ -26,7 +26,6 @@
  * @summary Test virtual threads using core reflection
  * @modules java.base/java.lang:+open
  * @library /test/lib
- * @enablePreview
  * @run junit Reflection
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/ShutdownHook.java b/test/jdk/java/lang/Thread/virtual/ShutdownHook.java
index ac72fdb3cf1..84c59dcc82f 100644
--- a/test/jdk/java/lang/Thread/virtual/ShutdownHook.java
+++ b/test/jdk/java/lang/Thread/virtual/ShutdownHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @library /test/lib
  * @summary Shutdown hook is called with virtual thread
- * @enablePreview
  * @run main ShutdownHook test
  */
 
@@ -37,7 +36,7 @@ public class ShutdownHook {
 
     public static void main(String[] args) throws Exception {
         if (args.length > 0) {
-            ProcessBuilder pb = createTestJvm("--enable-preview", "ShutdownHook");
+            ProcessBuilder pb = createTestJvm("ShutdownHook");
             OutputAnalyzer output = executeProcess(pb);
             output.shouldContain("Shutdown Hook");
             output.shouldHaveExitValue(0);
diff --git a/test/jdk/java/lang/Thread/virtual/StackTraces.java b/test/jdk/java/lang/Thread/virtual/StackTraces.java
index 824dfa0c3ef..fb5c40dc4e9 100644
--- a/test/jdk/java/lang/Thread/virtual/StackTraces.java
+++ b/test/jdk/java/lang/Thread/virtual/StackTraces.java
@@ -28,7 +28,6 @@
  * @requires vm.continuations
  * @modules java.management
  * @library /test/lib
- * @enablePreview
  * @run junit StackTraces
  * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowCarrierFrames StackTraces
  */
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
index 97e67cfc57c..9c4265097e1 100644
--- a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
+++ b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
@@ -25,7 +25,6 @@
  * @test id=default
  * @bug 8284161 8286788
  * @summary Test Thread API with virtual threads
- * @enablePreview
  * @modules java.base/java.lang:+open
  * @library /test/lib
  * @run junit ThreadAPI
@@ -34,7 +33,6 @@
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @enablePreview
  * @modules java.base/java.lang:+open
  * @library /test/lib
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations ThreadAPI
@@ -1247,7 +1245,7 @@ class ThreadAPI {
         VThreadRunner.run(() -> {
             long start = millisTime();
             sleeper.run();
-            expectDuration(start, /*min*/900, /*max*/4000);
+            expectDuration(start, /*min*/900, /*max*/20_000);
         });
     }
 
@@ -1337,7 +1335,7 @@ class ThreadAPI {
 
             long start = millisTime();
             Thread.sleep(1000);
-            expectDuration(start, /*min*/900, /*max*/4000);
+            expectDuration(start, /*min*/900, /*max*/20_000);
 
             // check that parking permit was not consumed
             LockSupport.park();
@@ -1354,7 +1352,7 @@ class ThreadAPI {
             try {
                 long start = millisTime();
                 Thread.sleep(1000);
-                expectDuration(start, /*min*/900, /*max*/4000);
+                expectDuration(start, /*min*/900, /*max*/20_000);
             } catch (Exception e) {
                 exc.set(e);
             }
@@ -1382,7 +1380,7 @@ class ThreadAPI {
             synchronized (lock) {
                 Thread.sleep(1000);
             }
-            expectDuration(start, /*min*/900, /*max*/4000);
+            expectDuration(start, /*min*/900, /*max*/20_000);
         });
     }
 
@@ -1525,28 +1523,12 @@ class ThreadAPI {
         }
     }
 
-    /**
-     * Test Thread.xxxContextClassLoader when thread locals not supported.
-     */
-    @Test
-    void testContextClassLoader5() throws Exception {
-        ClassLoader scl = ClassLoader.getSystemClassLoader();
-        ClassLoader loader = new ClassLoader() { };
-        VThreadRunner.run(VThreadRunner.NO_THREAD_LOCALS, () -> {
-            Thread t = Thread.currentThread();
-            assertTrue(t.getContextClassLoader() == scl);
-            assertThrows(UnsupportedOperationException.class,
-                         () -> t.setContextClassLoader(loader));
-            assertTrue(t.getContextClassLoader() == scl);
-        });
-    }
-
     /**
      * Test Thread.xxxContextClassLoader when thread does not inherit the
      * initial value of inheritable thread locals.
      */
     @Test
-    void testContextClassLoader6() throws Exception {
+    void testContextClassLoader5() throws Exception {
         VThreadRunner.run(() -> {
             ClassLoader loader = new ClassLoader() { };
             Thread.currentThread().setContextClassLoader(loader);
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadLocals.java b/test/jdk/java/lang/Thread/virtual/ThreadLocals.java
index b6e930cdbab..5ccca313abd 100644
--- a/test/jdk/java/lang/Thread/virtual/ThreadLocals.java
+++ b/test/jdk/java/lang/Thread/virtual/ThreadLocals.java
@@ -25,7 +25,6 @@
  * @test
  * @summary Test Virtual threads using thread locals
  * @library /test/lib
- * @enablePreview
  * @run junit ThreadLocals
  */
 
@@ -66,48 +65,6 @@ class ThreadLocals {
         });
     }
 
-    /**
-     * Test Thread that cannot set values for its copy of thread-locals.
-     */
-    @Test
-    void testThreadLocal3() throws Exception {
-        Object INITIAL_VALUE = new Object();
-        ThreadLocal<Object> LOCAL2 = new ThreadLocal<>() {
-            @Override
-            protected Object initialValue() {
-                return INITIAL_VALUE;
-            }
-        };
-        ThreadLocal<Object> INHERITED_LOCAL2 = new InheritableThreadLocal<>()  {
-            @Override
-            protected Object initialValue() {
-                return INITIAL_VALUE;
-            }
-        };
-
-        VThreadRunner.run(VThreadRunner.NO_THREAD_LOCALS, () -> {
-            assertThrows(UnsupportedOperationException.class, () -> LOCAL.set(null));
-            assertThrows(UnsupportedOperationException.class, () -> LOCAL.set(new Object()));
-            assertNull(LOCAL.get());
-            LOCAL.remove();  // should not throw
-
-            assertThrows(UnsupportedOperationException.class, () -> LOCAL2.set(null));
-            assertThrows(UnsupportedOperationException.class, () -> LOCAL2.set(new Object()));
-            assertTrue(LOCAL2.get() == INITIAL_VALUE);
-            LOCAL2.remove();  // should not throw
-
-            assertThrows(UnsupportedOperationException.class, () -> INHERITED_LOCAL.set(null));
-            assertThrows(UnsupportedOperationException.class, () -> INHERITED_LOCAL.set(new Object()));
-            assertNull(INHERITED_LOCAL.get());
-            INHERITED_LOCAL.remove();  // should not throw
-
-            assertThrows(UnsupportedOperationException.class, () -> INHERITED_LOCAL2.set(null));
-            assertThrows(UnsupportedOperationException.class, () -> INHERITED_LOCAL2.set(new Object()));
-            assertTrue(INHERITED_LOCAL2.get() == INITIAL_VALUE);
-            INHERITED_LOCAL2.remove();  // should not throw
-        });
-    }
-
     /**
      * Basic test of inheritable thread local set/get, no initial value inherited.
      */
diff --git a/test/jdk/java/lang/Thread/virtual/TracePinnedThreads.java b/test/jdk/java/lang/Thread/virtual/TracePinnedThreads.java
index dd3156699a8..01fbdc76d49 100644
--- a/test/jdk/java/lang/Thread/virtual/TracePinnedThreads.java
+++ b/test/jdk/java/lang/Thread/virtual/TracePinnedThreads.java
@@ -26,7 +26,6 @@
  * @bug 8284161 8289284
  * @summary Basic test of debugging option to trace pinned threads
  * @requires vm.continuations
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm -Djdk.tracePinnedThreads=full TracePinnedThreads
  * @run junit/othervm -Djdk.tracePinnedThreads=short TracePinnedThreads
@@ -84,7 +83,7 @@ class TracePinnedThreads {
     }
 
     /**
-     * Runs a task in a virutal thread, returning a String with any output printed
+     * Run a task in a virtual thread, returning a String with any output printed
      * to standard output.
      */
     private static String run(Runnable task) throws Exception {
diff --git a/test/jdk/java/lang/Thread/virtual/TraceVirtualThreadLocals.java b/test/jdk/java/lang/Thread/virtual/TraceVirtualThreadLocals.java
new file mode 100644
index 00000000000..6609dc9493b
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/TraceVirtualThreadLocals.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Test diagnostic option for detecting a virtual thread using thread locals
+ * @library /test/lib
+ * @run junit/othervm -Djdk.traceVirtualThreadLocals TraceVirtualThreadLocals
+ * @run junit/othervm -Djdk.traceVirtualThreadLocals=true TraceVirtualThreadLocals
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import jdk.test.lib.thread.VThreadRunner;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class TraceVirtualThreadLocals {
+
+    @Test
+    void testInitialValue() throws Exception {
+        String output = run(() -> {
+            ThreadLocal<String> name = new ThreadLocal<>() {
+                @Override
+                protected String initialValue() {
+                    return "<unnamed>";
+                }
+            };
+            name.get();
+        });
+        assertContains(output, "java.lang.ThreadLocal.setInitialValue");
+    }
+
+    @Test
+    void testSet() throws Exception {
+        String output = run(() -> {
+            ThreadLocal<String> name = new ThreadLocal<>();
+            name.set("duke");
+        });
+        assertContains(output, "java.lang.ThreadLocal.set");
+    }
+
+    /**
+     * Run a task in a virtual thread, returning a String with any output printed
+     * to standard output.
+     */
+    private static String run(Runnable task) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PrintStream original = System.out;
+        System.setOut(new PrintStream(baos, true));
+        try {
+            VThreadRunner.run(task::run);
+        } finally {
+            System.setOut(original);
+        }
+        String output = new String(baos.toByteArray());
+        System.out.println(output);
+        return output;
+    }
+
+    /**
+     * Tests that s1 contains s2.
+     */
+    private static void assertContains(String s1, String s2) {
+        assertTrue(s1.contains(s2), s2 + " not found!!!");
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java b/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java
new file mode 100644
index 00000000000..a4bccd47265
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Test parking when pinned and emitting the JFR VirtualThreadPinnedEvent throws
+ * @modules java.base/jdk.internal.event
+ * @compile/module=java.base jdk/internal/event/VirtualThreadPinnedEvent.java
+ * @run junit VirtualThreadPinnedEventThrows
+ */
+
+import java.lang.ref.Reference;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
+import jdk.internal.event.VirtualThreadPinnedEvent;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class VirtualThreadPinnedEventThrows {
+
+    /**
+     * Test parking when pinned and creating the VirtualThreadPinnedEvent fails with OOME.
+     */
+    @Test
+    void testVirtualThreadPinnedEventCreateThrows() throws Exception {
+        VirtualThreadPinnedEvent.setCreateThrows(true);
+        try {
+            testParkWhenPinned();
+        } finally {
+            VirtualThreadPinnedEvent.setCreateThrows(false);
+        }
+    }
+
+    /**
+     * Test parking when pinned and VirtualThreadPinnedEvent.begin fails with OOME.
+     */
+    @Test
+    void testVirtualThreadPinnedEventBeginThrows() throws Exception {
+        VirtualThreadPinnedEvent.setBeginThrows(true);
+        try {
+            testParkWhenPinned();
+        } finally {
+            VirtualThreadPinnedEvent.setBeginThrows(false);
+        }
+    }
+
+    /**
+     * Test parking when pinned and VirtualThreadPinnedEvent.commit fails with OOME.
+     */
+    @Test
+    void testVirtualThreadPinnedEventCommitThrows() throws Exception {
+        VirtualThreadPinnedEvent.setCommitThrows(true);
+        try {
+            testParkWhenPinned();
+        } finally {
+            VirtualThreadPinnedEvent.setCommitThrows(false);
+        }
+    }
+
+    /**
+     * Test parking a virtual thread when pinned.
+     */
+    private void testParkWhenPinned() throws Exception {
+        Object lock = new Object();
+        try {
+            var completed = new AtomicBoolean();
+            Thread thread = Thread.startVirtualThread(() -> {
+                synchronized (lock) {
+                    LockSupport.park();
+                    completed.set(true);
+                }
+            });
+
+            // wait for thread to park
+            Thread.State state;
+            while ((state = thread.getState()) != Thread.State.WAITING) {
+                assertTrue(state != Thread.State.TERMINATED);
+                Thread.sleep(10);
+            }
+
+            // unpark and check that thread completed without exception
+            LockSupport.unpark(thread);
+            thread.join();
+            assertTrue(completed.get());
+        } finally {
+            Reference.reachabilityFence(lock);
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/WaitNotify.java b/test/jdk/java/lang/Thread/virtual/WaitNotify.java
index 81f7f48b690..bc7b36b39be 100644
--- a/test/jdk/java/lang/Thread/virtual/WaitNotify.java
+++ b/test/jdk/java/lang/Thread/virtual/WaitNotify.java
@@ -25,7 +25,6 @@
  * @test
  * @summary Test virtual threads using Object.wait/notifyAll
  * @library /test/lib
- * @enablePreview
  * @run junit WaitNotify
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/YieldQueuing.java b/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
index 33961848667..edb0b6e9f74 100644
--- a/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
+++ b/test/jdk/java/lang/Thread/virtual/YieldQueuing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @summary Test Thread.yield submits the virtual thread task to the expected queue
  * @requires vm.continuations
- * @enablePreview
  * @run junit/othervm -Djdk.virtualThreadScheduler.maxPoolSize=1 YieldQueuing
  */
 
diff --git a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/PreviewFeaturesNotEnabled.java b/test/jdk/java/lang/Thread/virtual/java.base/jdk/internal/event/VirtualThreadPinnedEvent.java
similarity index 50%
rename from test/jdk/jdk/incubator/concurrent/StructuredTaskScope/PreviewFeaturesNotEnabled.java
rename to test/jdk/java/lang/Thread/virtual/java.base/jdk/internal/event/VirtualThreadPinnedEvent.java
index 65cb6c26d2f..f267191b307 100644
--- a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/PreviewFeaturesNotEnabled.java
+++ b/test/jdk/java/lang/Thread/virtual/java.base/jdk/internal/event/VirtualThreadPinnedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,33 +21,45 @@
  * questions.
  */
 
+package jdk.internal.event;
+
 /**
- * @test
- * @bug 8284199
- * @summary Test StructuredTaskScope without --enable-preview
- * @modules jdk.incubator.concurrent
- * @run junit/othervm PreviewFeaturesNotEnabled
+ * VirtualThreadPinnedEvent to optionally throw OOME at create, begin or commit time.
  */
+public class VirtualThreadPinnedEvent extends Event {
+    private static boolean throwOnCreate;
+    private static boolean throwOnBegin;
+    private static boolean throwOnCommit;
 
-import jdk.incubator.concurrent.StructuredTaskScope;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class PreviewFeaturesNotEnabled {
-    /**
-     * One-arg constructor needs --enable-preview.
-     */
-    @Test
-    void testUnsupportedOperationException() {
-        assertThrows(UnsupportedOperationException.class, StructuredTaskScope::new);
+    public static void setCreateThrows(boolean value) {
+        throwOnCreate = value;
     }
 
-    /**
-     * Two-arg constructor does not need --enable-preview.
-     */
-    @Test
-    void testNoUnsupportedOperationException() {
-        try (var scope = new StructuredTaskScope<Object>(null, Thread::new)) {
+    public static void setBeginThrows(boolean value) {
+        throwOnBegin = value;
+    }
+
+    public static void setCommitThrows(boolean value) {
+        throwOnCommit = value;
+    }
+
+    public VirtualThreadPinnedEvent() {
+        if (throwOnCreate) {
+            throw new OutOfMemoryError();
+        }
+    }
+
+    @Override
+    public void begin() {
+        if (throwOnBegin) {
+            throw new OutOfMemoryError();
+        }
+    }
+
+    @Override
+    public void commit() {
+        if (throwOnCommit) {
+            throw new OutOfMemoryError();
         }
     }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java
index a81726983ba..c86daf1bc6f 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @summary Stress test asynchronous Thread.getStackTrace
  * @requires vm.debug != true & vm.continuations
  * @modules java.base/java.lang:+open
- * @enablePreview
  * @compile GetStackTraceALot.java ../ThreadBuilders.java
  * @run main GetStackTraceALot
  */
@@ -35,7 +34,6 @@
  * @test
  * @requires vm.debug == true & vm.continuations
  * @modules java.base/java.lang:+open
- * @enablePreview
  * @compile GetStackTraceALot.java ../ThreadBuilders.java
  * @run main/timeout=300 GetStackTraceALot 1000
  */
diff --git a/test/jdk/java/lang/Thread/virtual/stress/PinALot.java b/test/jdk/java/lang/Thread/virtual/stress/PinALot.java
index 6972fd1c915..7bfce95b5c2 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/PinALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/PinALot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,12 @@
  * @test
  * @summary Stress test timed park when pinned
  * @requires vm.debug != true
- * @enablePreview
  * @run main PinALot 500000
  */
 
 /*
  * @test
  * @requires vm.debug == true
- * @enablePreview
  * @run main/othervm/timeout=300 PinALot 200000
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/stress/PingPong.java b/test/jdk/java/lang/Thread/virtual/stress/PingPong.java
index e5b888c828a..404444b99ce 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/PingPong.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/PingPong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test id=sq
  * @summary Stress test virtual threads with a SynchronousQueue
  * @requires vm.debug != true
- * @enablePreview
  * @run main PingPong SQ 500000
  */
 
@@ -33,7 +32,6 @@
  * @test id=ltq
  * @summary Stress test virtual threads with a LinkedTransferQueue
  * @requires vm.debug != true
- * @enablePreview
  * @run main PingPong LTQ 500000
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java b/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
index ed21adfecab..78a2ea618d9 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @summary Stress test virtual threads with a variation of the Skynet 1M benchmark
  * @requires vm.continuations
- * @enablePreview
  * @run main/othervm/timeout=300 -Xmx1g Skynet
  */
 
@@ -33,7 +32,6 @@
  * @test
  * @requires vm.debug == true & vm.continuations
  * @requires vm.gc.Z
- * @enablePreview
  * @run main/othervm/timeout=300 -XX:+UnlockDiagnosticVMOptions
  *     -XX:+ZVerifyViews -XX:ZCollectionInterval=0.01 -Xmx1g Skynet
  */
diff --git a/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java b/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java
index 9744ff6a48b..12771ab499a 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,12 @@
  * @test
  * @summary Stress test Thread.sleep
  * @requires vm.debug != true & vm.continuations
- * @enablePreview
  * @run main/othervm SleepALot 500000
  */
 
 /*
  * @test
  * @requires vm.debug == true & vm.continuations
- * @enablePreview
  * @run main/othervm/timeout=300 SleepALot 200000
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/stress/TimedGet.java b/test/jdk/java/lang/Thread/virtual/stress/TimedGet.java
index 232912ea228..60125e1ac56 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/TimedGet.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/TimedGet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @summary Stress parking with CompletableFuture timed get
  * @requires vm.debug != true & vm.continuations
- * @enablePreview
  * @run main/othervm -Xmx1g TimedGet 100000
  */
 
diff --git a/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java b/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java
index 51381f12b02..3eabfff1c4c 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,12 @@
  * @test
  * @summary Stress test Thread.yield
  * @requires vm.debug != true
- * @enablePreview
  * @run main YieldALot 350000
  */
 
 /*
  * @test
  * @requires vm.debug == true
- * @enablePreview
  * @run main YieldALot 200000
  */
 
diff --git a/test/jdk/java/lang/instrument/ParallelTransformerLoaderTest.java b/test/jdk/java/lang/instrument/ParallelTransformerLoaderTest.java
index 66332f68f6b..a1961b0860c 100644
--- a/test/jdk/java/lang/instrument/ParallelTransformerLoaderTest.java
+++ b/test/jdk/java/lang/instrument/ParallelTransformerLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,12 @@
  * @requires vm.continuations
  * @library /test/lib
  * @run build TestClass1 TestClass2 TestClass3
- * @compile --enable-preview -source ${jdk.version} ParallelTransformerLoaderTest.java
+ * @compile ParallelTransformerLoaderTest.java
  * @run driver jdk.test.lib.util.JavaAgentBuilder ParallelTransformerLoaderAgent ParallelTransformerLoaderAgent.jar
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar Test.jar TestClass1 TestClass2 TestClass3
  * @run clean ParallelTransformerLoaderAgent TestClass1 TestClass2 TestClass3
- * @run main/othervm --enable-preview -javaagent:ParallelTransformerLoaderAgent.jar=Test.jar ParallelTransformerLoaderTest platform
- * @run main/othervm --enable-preview -javaagent:ParallelTransformerLoaderAgent.jar=Test.jar ParallelTransformerLoaderTest virtual
+ * @run main/othervm -javaagent:ParallelTransformerLoaderAgent.jar=Test.jar ParallelTransformerLoaderTest platform
+ * @run main/othervm -javaagent:ParallelTransformerLoaderAgent.jar=Test.jar ParallelTransformerLoaderTest virtual
  */
 public class ParallelTransformerLoaderTest {
     private static final int kNumIterations = 1000;
diff --git a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java
index 52ef8dd4375..d4da6073337 100644
--- a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java
+++ b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8284161 8287103
  * @summary Test ThredMXBean.findMonitorDeadlockedThreads with cycles of
  *   platform and virtual threads in deadlock
- * @enablePreview
  * @modules java.base/java.lang:+open java.management
  * @library /test/lib
  * @run main/othervm VirtualThreadDeadlocks PP
@@ -37,7 +36,6 @@
 /**
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @enablePreview
  * @modules java.base/java.lang:+open java.management
  * @library /test/lib
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations VirtualThreadDeadlocks PP
diff --git a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java
index a64a4c06f7f..35fe819313a 100644
--- a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java
+++ b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java
@@ -25,7 +25,6 @@
  * @test id=default
  * @bug 8284161 8290562 8303242
  * @summary Test java.lang.management.ThreadMXBean with virtual threads
- * @enablePreview
  * @modules java.base/java.lang:+open java.management
  * @library /test/lib
  * @run junit/othervm VirtualThreads
@@ -34,7 +33,6 @@
 /**
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @enablePreview
  * @modules java.base/java.lang:+open java.management
  * @library /test/lib
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations VirtualThreads
@@ -78,8 +76,9 @@ public class VirtualThreads {
                     .map(ThreadInfo::getThreadId)
                     .collect(Collectors.toSet());
 
-            // current thread should be included
-            assertTrue(tids.contains(Thread.currentThread().threadId()));
+            // if current thread is a platform thread then it should be included
+            boolean expected = !Thread.currentThread().isVirtual();
+            assertEquals(expected, tids.contains(Thread.currentThread().threadId()));
 
             // virtual thread should not be included
             assertFalse(tids.contains(vthread.threadId()));
@@ -97,9 +96,10 @@ public class VirtualThreads {
         try {
             long[] tids = ManagementFactory.getThreadMXBean().getAllThreadIds();
 
-            // current thread should be included
+            // if current thread is a platform thread then it should be included
+            boolean expected = !Thread.currentThread().isVirtual();
             long currentTid = Thread.currentThread().threadId();
-            assertTrue(Arrays.stream(tids).anyMatch(tid -> tid == currentTid));
+            assertEquals(expected, Arrays.stream(tids).anyMatch(tid -> tid == currentTid));
 
             // virtual thread should not be included
             long vtid = vthread.threadId();
@@ -153,7 +153,11 @@ public class VirtualThreads {
             long tid1 = vthread.threadId();
             long[] tids = new long[] { tid0, tid1 };
             ThreadInfo[] infos = ManagementFactory.getThreadMXBean().getThreadInfo(tids, maxDepth);
-            assertEquals(tid0, infos[0].getThreadId());
+            if (Thread.currentThread().isVirtual()) {
+                assertNull(infos[0]);
+            } else {
+                assertEquals(tid0, infos[0].getThreadId());
+            }
             assertNull(infos[1]);
         } finally {
             LockSupport.unpark(vthread);
@@ -174,7 +178,11 @@ public class VirtualThreads {
             long[] tids = new long[] { tid0, tid1 };
             ThreadMXBean bean = ManagementFactory.getThreadMXBean();
             ThreadInfo[] infos = bean.getThreadInfo(tids, false, false, maxDepth);
-            assertEquals(tid0, infos[0].getThreadId());
+            if (Thread.currentThread().isVirtual()) {
+                assertNull(infos[0]);
+            } else {
+                assertEquals(tid0, infos[0].getThreadId());
+            }
             assertNull(infos[1]);
         } finally {
             LockSupport.unpark(vthread);
diff --git a/test/jdk/java/lang/ref/CleanerTest.java b/test/jdk/java/lang/ref/CleanerTest.java
index 3a034c11157..e4119338252 100644
--- a/test/jdk/java/lang/ref/CleanerTest.java
+++ b/test/jdk/java/lang/ref/CleanerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,7 @@ import org.testng.annotations.Test;
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.ref
  *          java.management
- * @enablePreview
- * @compile -source ${jdk.version} CleanerTest.java
+ * @compile CleanerTest.java
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run testng/othervm
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
diff --git a/test/jdk/java/net/Socket/Timeouts.java b/test/jdk/java/net/Socket/Timeouts.java
index b70589f65d0..e70037a39d1 100644
--- a/test/jdk/java/net/Socket/Timeouts.java
+++ b/test/jdk/java/net/Socket/Timeouts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @bug 8221481
  * @library /test/lib
  * @build jdk.test.lib.Utils
- * @enablePreview
  * @compile Timeouts.java
  * @run testng/othervm/timeout=180 Timeouts
  * @summary Test Socket timeouts
diff --git a/test/jdk/java/net/vthread/BlockingSocketOps.java b/test/jdk/java/net/vthread/BlockingSocketOps.java
index e804c7d9e44..d9ae36fbb77 100644
--- a/test/jdk/java/net/vthread/BlockingSocketOps.java
+++ b/test/jdk/java/net/vthread/BlockingSocketOps.java
@@ -25,7 +25,6 @@
  * @test id=default
  * @bug 8284161
  * @summary Test virtual threads doing blocking I/O on java.net sockets
- * @enablePreview
  * @library /test/lib
  * @run junit BlockingSocketOps
  */
@@ -34,7 +33,6 @@
  * @test id=direct-register
  * @summary Test virtual threads doing blocking I/O on java.net sockets and with
  *    the I/O poller configured to use direct registration
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm -Djdk.useDirectRegister BlockingSocketOps
  */
@@ -42,7 +40,6 @@
 /**
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations BlockingSocketOps
  */
diff --git a/test/jdk/java/net/vthread/HttpALot.java b/test/jdk/java/net/vthread/HttpALot.java
index c0659e61a2d..c016824a92a 100644
--- a/test/jdk/java/net/vthread/HttpALot.java
+++ b/test/jdk/java/net/vthread/HttpALot.java
@@ -28,7 +28,6 @@
  * @requires vm.debug != true
  * @modules jdk.httpserver
  * @library /test/lib
- * @enablePreview
  * @comment This test runs with -Dsun.net.httpserver.nodelay=true to enable TCP_NODELAY on the
  *          sockets "accept()"ed by the HttpServer. This is to avoid occasional 40ms delays
  *          receiving responses from the server on Linux.
diff --git a/test/jdk/java/net/vthread/InterruptHttp.java b/test/jdk/java/net/vthread/InterruptHttp.java
index 5eaa209b130..ebe5e52a3d4 100644
--- a/test/jdk/java/net/vthread/InterruptHttp.java
+++ b/test/jdk/java/net/vthread/InterruptHttp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @summary Test that HTTP connections can be interrupted
  * @library /test/lib
- * @enablePreview
  * @compile InterruptHttp.java
  * @run main/othervm InterruptHttp
  */
diff --git a/test/jdk/java/nio/channels/DatagramChannel/AdaptorAsyncCloseAfterReceive.java b/test/jdk/java/nio/channels/DatagramChannel/AdaptorAsyncCloseAfterReceive.java
index cef2c8cf09a..8b9b529c111 100644
--- a/test/jdk/java/nio/channels/DatagramChannel/AdaptorAsyncCloseAfterReceive.java
+++ b/test/jdk/java/nio/channels/DatagramChannel/AdaptorAsyncCloseAfterReceive.java
@@ -26,7 +26,6 @@
  * @bug 8280113
  * @summary Test async close of a DatagramSocket obtained from a DatagramChannel where
  *     the DatagramChannel's internal socket address caches are already populated
- * @enablePreview
  * @library /test/lib
  * @run junit AdaptorAsyncCloseAfterReceive
  */
diff --git a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
index 8fb878987b7..bf35fe22aee 100644
--- a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
+++ b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
@@ -25,7 +25,6 @@
  * @test id=default
  * @bug 8284161
  * @summary Test virtual threads doing blocking I/O on NIO channels
- * @enablePreview
  * @library /test/lib
  * @run junit BlockingChannelOps
  */
@@ -34,7 +33,6 @@
  * @test id=direct-register
  * @summary Test virtual threads doing blocking I/O on NIO channels and with
  *    the I/O poller configured to use direct registration
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm -Djdk.useDirectRegister BlockingChannelOps
  */
@@ -42,7 +40,6 @@
 /**
  * @test id=no-vmcontinuations
  * @requires vm.continuations
- * @enablePreview
  * @library /test/lib
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations BlockingChannelOps
  */
diff --git a/test/jdk/java/util/concurrent/ExecutorService/CloseTest.java b/test/jdk/java/util/concurrent/ExecutorService/CloseTest.java
index 66af1332832..193a4677354 100644
--- a/test/jdk/java/util/concurrent/ExecutorService/CloseTest.java
+++ b/test/jdk/java/util/concurrent/ExecutorService/CloseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
  * @test
  * @summary Test ExecutorService.close, including default implementation
  * @library ../lib
- * @enablePreview
  * @run testng CloseTest
  */
 
diff --git a/test/jdk/java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java b/test/jdk/java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java
index caaa2a23bf8..d57cacb7001 100644
--- a/test/jdk/java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java
+++ b/test/jdk/java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java
@@ -24,13 +24,11 @@
 /*
  * @test id=platform
  * @summary Basic tests for new thread-per-task executors
- * @enablePreview
  * @run junit/othervm -DthreadFactory=platform ThreadPerTaskExecutorTest
  */
 
 /*
  * @test id=virtual
- * @enablePreview
  * @run junit/othervm -DthreadFactory=virtual ThreadPerTaskExecutorTest
  */
 
diff --git a/test/jdk/jdk/incubator/concurrent/ScopedValue/ManyBindings.java b/test/jdk/jdk/incubator/concurrent/ScopedValue/ManyBindings.java
index 1061c292824..2bb35cc2c64 100644
--- a/test/jdk/jdk/incubator/concurrent/ScopedValue/ManyBindings.java
+++ b/test/jdk/jdk/incubator/concurrent/ScopedValue/ManyBindings.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary Stress test ScopedValue with many bindings and rebinings
- * @enablePreview
  * @modules jdk.incubator.concurrent
  * @library /test/lib
  * @key randomness
diff --git a/test/jdk/jdk/incubator/concurrent/ScopedValue/ScopeValueAPI.java b/test/jdk/jdk/incubator/concurrent/ScopedValue/ScopeValueAPI.java
index ca060ae96ed..c51cee3b1c1 100644
--- a/test/jdk/jdk/incubator/concurrent/ScopedValue/ScopeValueAPI.java
+++ b/test/jdk/jdk/incubator/concurrent/ScopedValue/ScopeValueAPI.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary Test ScopedValue API
- * @enablePreview
  * @modules jdk.incubator.concurrent
  * @run junit ScopeValueAPI
  */
diff --git a/test/jdk/jdk/incubator/concurrent/ScopedValue/StressStackOverflow.java b/test/jdk/jdk/incubator/concurrent/ScopedValue/StressStackOverflow.java
index c5e6cd54589..18d16b69240 100644
--- a/test/jdk/jdk/incubator/concurrent/ScopedValue/StressStackOverflow.java
+++ b/test/jdk/jdk/incubator/concurrent/ScopedValue/StressStackOverflow.java
@@ -25,10 +25,10 @@
  * @test
  * @summary StressStackOverflow the recovery path for ScopedValue
  * @modules jdk.incubator.concurrent
- * @compile --enable-preview -source ${jdk.version} StressStackOverflow.java
- * @run main/othervm/timeout=300 -XX:-TieredCompilation --enable-preview StressStackOverflow
- * @run main/othervm/timeout=300 -XX:TieredStopAtLevel=1 --enable-preview StressStackOverflow
- * @run main/othervm/timeout=300 --enable-preview StressStackOverflow
+ * @compile StressStackOverflow.java
+ * @run main/othervm/timeout=300 -XX:-TieredCompilation StressStackOverflow
+ * @run main/othervm/timeout=300 -XX:TieredStopAtLevel=1 StressStackOverflow
+ * @run main/othervm/timeout=300 StressStackOverflow
  */
 
 import java.util.concurrent.Callable;
diff --git a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java b/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
index ba6a22b83d1..59d84b1bfdf 100644
--- a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
+++ b/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
@@ -25,14 +25,12 @@
  * @test id=platform
  * @bug 8284199
  * @summary Basic tests for StructuredTaskScope
- * @enablePreview
  * @modules jdk.incubator.concurrent
  * @run junit/othervm -DthreadFactory=platform StructuredTaskScopeTest
  */
 
 /*
  * @test id=virtual
- * @enablePreview
  * @modules jdk.incubator.concurrent
  * @run junit/othervm -DthreadFactory=virtual StructuredTaskScopeTest
  */
diff --git a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredThreadDumpTest.java b/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredThreadDumpTest.java
index 76e1bbd364e..cc20e743ec3 100644
--- a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredThreadDumpTest.java
+++ b/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/StructuredThreadDumpTest.java
@@ -25,7 +25,6 @@
  * @test
  * @bug 8284199
  * @summary Test thread dumps with StructuredTaskScope
- * @enablePreview
  * @modules jdk.incubator.concurrent
  * @library /test/lib
  * @run junit/othervm StructuredThreadDumpTest
diff --git a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/WithScopedValue.java b/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/WithScopedValue.java
index 7bb0b888b94..402991285d2 100644
--- a/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/WithScopedValue.java
+++ b/test/jdk/jdk/incubator/concurrent/StructuredTaskScope/WithScopedValue.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary Basic tests for StructuredTaskScope with scoped values
- * @enablePreview
  * @modules jdk.incubator.concurrent
  * @run junit WithScopedValue
  */
diff --git a/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java b/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
index dd22bbd7e01..00bddec6b56 100644
--- a/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
+++ b/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@ import static org.testng.Assert.*;
  * @summary TerminatingThreadLocal unit test
  * @modules java.base/java.lang:+open java.base/jdk.internal.misc
  * @requires vm.continuations
- * @enablePreview
  * @run testng/othervm TestTerminatingThreadLocal
  */
 public class TestTerminatingThreadLocal {
@@ -140,7 +139,6 @@ public class TestTerminatingThreadLocal {
 
             ThreadFactory factory = virtualThreadBuilder(pool)
                     .name("ttl-test-virtual-", 0)
-                    .allowSetThreadLocals(false)
                     .factory();
             try (var executor = Executors.newThreadPerTaskExecutor(factory)) {
                 executor.submit(() -> ttlOps.accept(ttl)).get();
diff --git a/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java b/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
index dcaa3c5a78b..458d4160705 100644
--- a/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
+++ b/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
@@ -25,14 +25,12 @@
  * @test id=platform
  * @summary Basic tests for ThreadFlock
  * @modules java.base/jdk.internal.misc
- * @enablePreview
  * @run junit/othervm -DthreadFactory=platform ThreadFlockTest
  */
 
 /*
  * @test id=virtual
  * @modules java.base/jdk.internal.misc
- * @enablePreview
  * @run junit/othervm -DthreadFactory=virtual ThreadFlockTest
  */
 
diff --git a/test/jdk/jdk/internal/misc/ThreadFlock/WithScopedValue.java b/test/jdk/jdk/internal/misc/ThreadFlock/WithScopedValue.java
index 32fce35cccb..97cf574d911 100644
--- a/test/jdk/jdk/internal/misc/ThreadFlock/WithScopedValue.java
+++ b/test/jdk/jdk/internal/misc/ThreadFlock/WithScopedValue.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary Test ThreadFlock with scoped values
- * @enablePreview
  * @modules java.base/jdk.internal.misc
  * @modules jdk.incubator.concurrent
  * @run junit WithScopedValue
diff --git a/test/jdk/jdk/internal/vm/Continuation/Basic.java b/test/jdk/jdk/internal/vm/Continuation/Basic.java
index 5735a3301c4..f7858cfa22b 100644
--- a/test/jdk/jdk/internal/vm/Continuation/Basic.java
+++ b/test/jdk/jdk/internal/vm/Continuation/Basic.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,13 @@
 * @modules java.base/jdk.internal.vm
 * @build java.base/java.lang.StackWalkerHelper
 *
-* @enablePreview
-* @run testng/othervm -Xint Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xint Basic
 *
-* @run testng/othervm -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
-* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
-* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,Basic.manyArgsDriver Basic
-* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,jdk/internal/vm/Continuation.enter Basic
-* @run testng/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=inline,jdk/internal/vm/Continuation.run Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,Basic.manyArgsDriver Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=exclude,jdk/internal/vm/Continuation.enter Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic -XX:CompileCommand=inline,jdk/internal/vm/Continuation.run Basic
 */
 
 /**
@@ -47,10 +46,9 @@
 * @modules java.base/jdk.internal.vm
 * @build java.base/java.lang.StackWalkerHelper
 *
-* @enablePreview
-* @run testng/othervm -XX:+VerifyStack -Xint Basic
-* @run testng/othervm -XX:+VerifyStack -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
-* @run testng/othervm -XX:+VerifyStack -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+VerifyStack -Xint Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+VerifyStack -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
+* @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+VerifyStack -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,Basic Basic
 */
 
 import jdk.internal.vm.Continuation;
@@ -94,7 +92,7 @@ public class Basic {
             assertEquals(cont.isPreempted(), false);
 
             List<String> frames = cont.stackWalker().walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
-            assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "bar", "foo", "lambda$test1$0", "enter0", "enter"));
+            assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "bar", "foo", "lambda$test1$0", "run", "enter0", "enter"));
         }
         assertEquals(res.get(), 247);
         assertEquals(cont.isPreempted(), false);
@@ -141,7 +139,7 @@ public class Basic {
 
         List<String> expected0 = new ArrayList<>();
         IntStream.range(0, DEPTH).forEach(i -> { expected0.add("deep"); });
-        List<String> baseFrames = List.of("bar", "foo", "lambda$test1$0", "enter0", "enter", "run", "test1");
+        List<String> baseFrames = List.of("bar", "foo", "lambda$test1$0", "run", "enter0", "enter", "run", "test1");
         expected0.addAll(baseFrames);
 
         assertEquals(frames.subList(0, DEPTH + baseFrames.size()), expected0);
@@ -152,7 +150,7 @@ public class Basic {
 
         List<String> expected1 = new ArrayList<>();
         IntStream.range(0, DEPTH).forEach(i -> { expected1.add("deep"); });
-        expected1.addAll(List.of("bar", "foo", "lambda$test1$0", "enter0", "enter"));
+        expected1.addAll(List.of("bar", "foo", "lambda$test1$0", "run", "enter0", "enter"));
         assertEquals(frames, expected1);
     }
 
diff --git a/test/jdk/jdk/internal/vm/Continuation/BasicExt.java b/test/jdk/jdk/internal/vm/Continuation/BasicExt.java
index 9709d778845..47fa2e46aec 100644
--- a/test/jdk/jdk/internal/vm/Continuation/BasicExt.java
+++ b/test/jdk/jdk/internal/vm/Continuation/BasicExt.java
@@ -27,14 +27,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyContinuations -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -48,14 +47,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyContinuations -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -69,14 +67,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyContinuations -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -90,14 +87,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyContinuations -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -111,14 +107,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyContinuations -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -132,14 +127,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -153,14 +147,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -174,14 +167,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -195,14 +187,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
@@ -216,14 +207,13 @@
  * @summary Collection of basic continuation tests. CompilationPolicy controls which frames in a sequence should be compiled when calling Continuation.yield().
  * @requires vm.continuations
  * @requires vm.flavor == "server" & vm.opt.TieredCompilation != true
- * @enablePreview
  * @modules java.base/jdk.internal.vm
  * @library /test/lib /test/hotspot/jtreg
  * @build java.base/java.lang.StackWalkerHelper
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                     -Xbatch -XX:-TieredCompilation
  *                     -XX:CompileCommand=dontinline,*::*dontinline*
  *                     -XX:CompileCommand=dontinline,*::*dontjit*
diff --git a/test/jdk/jdk/internal/vm/Continuation/ClassUnloading.java b/test/jdk/jdk/internal/vm/Continuation/ClassUnloading.java
index 27fe0f62ebf..c69d7e1723d 100644
--- a/test/jdk/jdk/internal/vm/Continuation/ClassUnloading.java
+++ b/test/jdk/jdk/internal/vm/Continuation/ClassUnloading.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 * @summary Tests class unloading on virtual threads
 *
 * @requires vm.continuations
-* @enablePreview
 * @compile ClassUnloading.java
 * @run main/othervm -XX:-UseCompressedOops ClassUnloading
 * @run main/othervm -XX:+UseCompressedOops ClassUnloading
diff --git a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
index 14696c63fac..b6b936078c9 100644
--- a/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
+++ b/test/jdk/jdk/internal/vm/Continuation/Fuzz.java
@@ -34,7 +34,7 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm/timeout=300 --enable-preview -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm/timeout=300 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                               Fuzz
  */
 
@@ -51,7 +51,7 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm/timeout=300 --enable-preview -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm/timeout=300 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                               -XX:+PreserveFramePointer
  *                               Fuzz
  */
diff --git a/test/jdk/jdk/internal/vm/Continuation/HumongousStack.java b/test/jdk/jdk/internal/vm/Continuation/HumongousStack.java
index 2b4c6f725f6..cd3eeea9d7b 100644
--- a/test/jdk/jdk/internal/vm/Continuation/HumongousStack.java
+++ b/test/jdk/jdk/internal/vm/Continuation/HumongousStack.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 * @modules java.base/jdk.internal.vm
 *
 * @requires vm.gc.G1
-* @enablePreview
 * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xint HumongousStack 5000
 * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xcomp -XX:TieredStopAtLevel=3 -XX:CompileOnly=jdk/internal/vm/Continuation,HumongousStack HumongousStack 10000
 * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyContinuations -Xms2g -Xmx2g -XX:+UseG1GC -XX:G1HeapRegionSize=1m -Xss10m -Xcomp -XX:-TieredCompilation -XX:CompileOnly=jdk/internal/vm/Continuation,HumongousStack HumongousStack 10000
diff --git a/test/jdk/jdk/internal/vm/Continuation/LiveFramesDriver.java b/test/jdk/jdk/internal/vm/Continuation/LiveFramesDriver.java
index 68c236520c0..f1eb3e83499 100644
--- a/test/jdk/jdk/internal/vm/Continuation/LiveFramesDriver.java
+++ b/test/jdk/jdk/internal/vm/Continuation/LiveFramesDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @requires vm.continuations
  * @build java.base/java.lang.LiveFrames
  * @modules java.base/jdk.internal.vm
- * @enablePreview
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xint LiveFramesDriver
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,java/lang/LiveFrames LiveFramesDriver
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+TieredCompilation -XX:TieredStopAtLevel=3 -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,java/lang/LiveFrames LiveFramesDriver
diff --git a/test/jdk/jdk/internal/vm/Continuation/MovingCompWindow.java b/test/jdk/jdk/internal/vm/Continuation/MovingCompWindow.java
index 561825a6e10..57e28839a37 100644
--- a/test/jdk/jdk/internal/vm/Continuation/MovingCompWindow.java
+++ b/test/jdk/jdk/internal/vm/Continuation/MovingCompWindow.java
@@ -32,8 +32,7 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
- * @run main/othervm   --enable-preview
- *                     -XX:+UnlockDiagnosticVMOptions   -XX:+WhiteBoxAPI
+ * @run main/othervm   -XX:+UnlockDiagnosticVMOptions   -XX:+WhiteBoxAPI
  *                     -Xbootclasspath/a:.
  *                     -Xbatch
  *                     -XX:-TieredCompilation
diff --git a/test/jdk/jdk/internal/vm/Continuation/Scoped.java b/test/jdk/jdk/internal/vm/Continuation/Scoped.java
index 88d4699e03f..47cf0e67789 100644
--- a/test/jdk/jdk/internal/vm/Continuation/Scoped.java
+++ b/test/jdk/jdk/internal/vm/Continuation/Scoped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,8 @@
  * @requires vm.continuations
  * @modules java.base/jdk.internal.vm
  * @build java.base/java.lang.StackWalkerHelper
- * @enablePreview
- * @run testng/othervm -Xint Scoped
- * @run testng/othervm -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,Scoped Scoped
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xint Scoped
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames -Xcomp -XX:CompileOnly=jdk/internal/vm/Continuation,Scoped Scoped
  */
 
 import jdk.internal.vm.Continuation;
@@ -75,27 +74,27 @@ public class Scoped {
 
                         frames = cont.stackWalker().walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
                         System.out.println("No scope: " + frames);
-                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter", "run", "foo", "lambda$test1$0", "enter0", "enter"));
+                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter", "run", "foo", "lambda$test1$0", "run", "enter0", "enter"));
 
                         frames = cont.stackWalker(EnumSet.noneOf(StackWalker.Option.class), A).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
                         System.out.println("A: " + frames);
-                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter", "run", "foo", "lambda$test1$0", "enter0", "enter"));
+                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter", "run", "foo", "lambda$test1$0", "run", "enter0", "enter"));
 
                         frames = cont.stackWalker(EnumSet.noneOf(StackWalker.Option.class), B).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
                         System.out.println("B: " + frames);
-                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter"));
+                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter"));
 
                         frames = cont.stackWalker(EnumSet.noneOf(StackWalker.Option.class), C).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
                         System.out.println("C: " + frames);
-                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "enter0", "enter"));
+                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "run", "enter0", "enter"));
 
                         frames = cont.stackWalker(EnumSet.noneOf(StackWalker.Option.class), K).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
                         System.out.println("K: " + frames);
-                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter", "run", "foo", "lambda$test1$0", "enter0", "enter"));
+                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter", "run", "foo", "lambda$test1$0", "run", "enter0", "enter"));
 
                         frames = cont.stackWalker(EnumSet.noneOf(StackWalker.Option.class), null).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
                         System.out.println("null: " + frames);
-                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter", "run", "foo", "lambda$test1$0", "enter0", "enter"));
+                        assertEquals(frames, cont.isDone() ? List.of() : Arrays.asList("yield", "lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter", "run", "foo", "lambda$test1$0", "run", "enter0", "enter"));
                 }
                 assertEquals(res.get(), 2);
         }
@@ -120,23 +119,23 @@ public class Scoped {
 
                         List<String> frames = StackWalker.getInstance().walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
 
-                        assertEquals(frames.subList(0, 15), Arrays.asList("lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter", "run", "foo", "lambda$test1$0", "enter0", "enter", "run", "test1"));
+                        assertEquals(frames.subList(0, 18), Arrays.asList("lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter", "run", "foo", "lambda$test1$0", "run", "enter0", "enter", "run", "test1"));
 
                         frames = StackWalkerHelper.getInstance(C).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
 
-                        assertEquals(frames, Arrays.asList("lambda$bar$14", "enter0", "enter"));
+                        assertEquals(frames, Arrays.asList("lambda$bar$14", "run", "enter0", "enter"));
 
                         frames = StackWalkerHelper.getInstance(B).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
 
-                        assertEquals(frames, Arrays.asList("lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter"));
+                        assertEquals(frames, Arrays.asList("lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter"));
 
                         frames = StackWalkerHelper.getInstance(A).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
 
-                        assertEquals(frames, Arrays.asList("lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter", "run", "foo", "lambda$test1$0", "enter0", "enter"));
+                        assertEquals(frames, Arrays.asList("lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter", "run", "foo", "lambda$test1$0", "run", "enter0", "enter"));
 
                         frames = StackWalkerHelper.getInstance(K).walk(fs -> fs.map(StackWalker.StackFrame::getMethodName).collect(Collectors.toList()));
 
-                        assertEquals(frames.subList(0, 15), Arrays.asList("lambda$bar$14", "enter0", "enter", "run", "bar", "lambda$foo$8", "enter0", "enter", "run", "foo", "lambda$test1$0", "enter0", "enter", "run", "test1"));
+                        assertEquals(frames.subList(0, 18), Arrays.asList("lambda$bar$14", "run", "enter0", "enter", "run", "bar", "lambda$foo$8", "run", "enter0", "enter", "run", "foo", "lambda$test1$0", "run", "enter0", "enter", "run", "test1"));
 
                         long r = b+1;
                 });
diff --git a/test/jdk/jdk/jfr/event/runtime/TestThreadEndEvent.java b/test/jdk/jdk/jfr/event/runtime/TestThreadEndEvent.java
index abf9a32554b..160702de360 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadEndEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadEndEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ import jdk.test.lib.jfr.Events;
  * @key jfr
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib
- * @enablePreview
  * @compile TestThreadEndEvent.java LatchedThread.java
  * @run main/othervm jdk.jfr.event.runtime.TestThreadEndEvent
  */
diff --git a/test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java b/test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java
index 061c83663f3..afd96b66540 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ import jdk.test.lib.jfr.Events;
  * @key jfr
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib
- * @enablePreview
  * @run main/othervm jdk.jfr.event.runtime.TestThreadSleepEvent
  */
 public class TestThreadSleepEvent {
diff --git a/test/jdk/jdk/jfr/event/runtime/TestThreadStartEvent.java b/test/jdk/jdk/jfr/event/runtime/TestThreadStartEvent.java
index 7e4d2bfc4ce..9e8f7b13e31 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadStartEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadStartEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ import jdk.test.lib.jfr.Events;
  * @key jfr
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib
- * @enablePreview
  * @compile TestThreadStartEvent.java LatchedThread.java
  * @run main/othervm jdk.jfr.event.runtime.TestThreadStartEvent
  */
diff --git a/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadEndEvent.java b/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadEndEvent.java
index 675a90cbbb0..355ef163e6f 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadEndEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadEndEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ import jdk.test.lib.jfr.Events;
  * @key jfr
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib
- * @enablePreview
  * @compile TestVirtualThreadEndEvent.java LatchedThread.java
  * @run main/othervm jdk.jfr.event.runtime.TestVirtualThreadEndEvent
  */
diff --git a/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadStartEvent.java b/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadStartEvent.java
index b5f4e0cd843..7b4bdb4b28e 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadStartEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestVirtualThreadStartEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ import jdk.test.lib.jfr.Events;
  * @key jfr
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib
- * @enablePreview
  * @compile TestVirtualThreadStartEvent.java LatchedThread.java
  * @run main/othervm jdk.jfr.event.runtime.TestVirtualThreadStartEvent
  */
diff --git a/test/jdk/jdk/jfr/jvm/TestThreadExclusion.java b/test/jdk/jdk/jfr/jvm/TestThreadExclusion.java
index acb536ff2c7..bec725bc778 100644
--- a/test/jdk/jdk/jfr/jvm/TestThreadExclusion.java
+++ b/test/jdk/jdk/jfr/jvm/TestThreadExclusion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@ import static jdk.test.lib.Asserts.assertTrue;
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
- * @enablePreview
  * @compile TestThreadExclusion.java LatchedThread.java
  * @run main/othervm jdk.jfr.jvm.TestThreadExclusion
  */
diff --git a/test/jdk/jdk/jfr/jvm/TestVirtualThreadExclusion.java b/test/jdk/jdk/jfr/jvm/TestVirtualThreadExclusion.java
index 252fb0d6ece..6fdace2d87e 100644
--- a/test/jdk/jdk/jfr/jvm/TestVirtualThreadExclusion.java
+++ b/test/jdk/jdk/jfr/jvm/TestVirtualThreadExclusion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@ import static jdk.test.lib.Asserts.assertTrue;
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
- * @enablePreview
  * @compile TestVirtualThreadExclusion.java LatchedThread.java
  * @run main/othervm jdk.jfr.jvm.TestVirtualThreadExclusion
  */
diff --git a/test/jdk/jdk/jfr/threading/TestDeepVirtualStackTrace.java b/test/jdk/jdk/jfr/threading/TestDeepVirtualStackTrace.java
index 47db329b52f..d754d9cb598 100644
--- a/test/jdk/jdk/jfr/threading/TestDeepVirtualStackTrace.java
+++ b/test/jdk/jdk/jfr/threading/TestDeepVirtualStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@ import jdk.test.lib.jfr.Events;
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal
- * @enablePreview
  * @run main/othervm -XX:FlightRecorderOptions:stackdepth=2048
  *      jdk.jfr.threading.TestDeepVirtualStackTrace
  */
diff --git a/test/jdk/jdk/jfr/threading/TestManyVirtualThreads.java b/test/jdk/jdk/jfr/threading/TestManyVirtualThreads.java
index c3442c8c3a4..8991d9a3812 100644
--- a/test/jdk/jdk/jfr/threading/TestManyVirtualThreads.java
+++ b/test/jdk/jdk/jfr/threading/TestManyVirtualThreads.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@ import jdk.test.lib.Asserts;
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal
- * @enablePreview
  * @run main/othervm jdk.jfr.threading.TestManyVirtualThreads
  */
 public class TestManyVirtualThreads {
diff --git a/test/jdk/jdk/jfr/threading/TestNestedVirtualThreads.java b/test/jdk/jdk/jfr/threading/TestNestedVirtualThreads.java
index 4e9f6136427..6d4dbb766e1 100644
--- a/test/jdk/jdk/jfr/threading/TestNestedVirtualThreads.java
+++ b/test/jdk/jdk/jfr/threading/TestNestedVirtualThreads.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@ import jdk.test.lib.jfr.Events;
  * @requires vm.hasJFR & vm.continuations
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal
- * @enablePreview
  * @run main/othervm jdk.jfr.threading.TestNestedVirtualThreads
  */
 public class TestNestedVirtualThreads {
diff --git a/test/lib/jdk/test/lib/thread/VThreadRunner.java b/test/lib/jdk/test/lib/thread/VThreadRunner.java
index 106739ee7ab..74158c89a14 100644
--- a/test/lib/jdk/test/lib/thread/VThreadRunner.java
+++ b/test/lib/jdk/test/lib/thread/VThreadRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,6 @@ import java.util.concurrent.atomic.AtomicReference;
 public class VThreadRunner {
     private VThreadRunner() { }
 
-    /**
-     * Characteristic value signifying that the thread cannot set values for its
-     * copy of thread-locals.
-     */
-    public static final int NO_THREAD_LOCALS = 1 << 1;
-
     /**
      * Characteristic value signifying that initial values for inheritable
      * thread locals are not inherited from the constructing thread.
@@ -85,8 +79,6 @@ public class VThreadRunner {
         Thread.Builder builder = Thread.ofVirtual();
         if (name != null)
             builder.name(name);
-        if ((characteristics & NO_THREAD_LOCALS) != 0)
-            builder.allowSetThreadLocals(false);
         if ((characteristics & NO_INHERIT_THREAD_LOCALS) != 0)
             builder.inheritInheritableThreadLocals(false);
         Thread thread = builder.start(target);