diff --git a/‎test/hotspot/jtreg/compiler/vectorapi/TestVectorFallbackInlining.java‎
Lines changed: 7 additions & 2 deletions b/‎test/hotspot/jtreg/compiler/vectorapi/TestVectorFallbackInlining.java‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎test/hotspot/jtreg/compiler/vectorapi/VectorMaskCompareNotTest.java‎
Lines changed: 1 addition & 1 deletion b/‎test/hotspot/jtreg/compiler/vectorapi/VectorMaskCompareNotTest.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java‎
Lines changed: 2 additions & 2 deletions b/‎test/hotspot/jtreg/compiler/vectorapi/reshape/TestVectorReinterpret.java‎
Lines changed: 2 additions & 2 deletions
@@ -78,12 +78,17 @@ public class TestVectorFallbackInlining {
             "-XX:CompileCommand=inline,jdk.internal.vm.vector.VectorSupport::insert";
 
     public static void main(String[] args) {
+        // Note: Some platforms don't activate EnableVectorSupport by default. Required here.
         TestFramework.runWithFlags("--add-modules=jdk.incubator.vector",
                                    FORCE_INLINE_FALLBACK,
-                                   "-XX:+IncrementalInlineVector");
+                                   "-XX:+IncrementalInlineVector",
+                                   "-XX:+UnlockExperimentalVMOptions",
+                                   "-XX:+EnableVectorSupport");
         TestFramework.runWithFlags("--add-modules=jdk.incubator.vector",
                                    FORCE_INLINE_FALLBACK,
-                                   "-XX:-IncrementalInlineVector");
+                                   "-XX:-IncrementalInlineVector",
+                                   "-XX:+UnlockExperimentalVMOptions",
+                                   "-XX:+EnableVectorSupport");
     }
 
     @Test
 
@@ -35,7 +35,7 @@
  * @library /test/lib /
  * @summary test combining vector not operation with compare
  * @modules jdk.incubator.vector
- * @requires vm.opt.final.MaxVectorSize == "null" | vm.opt.final.MaxVectorSize >= 16
+ * @requires vm.opt.final.MaxVectorSize == null | vm.opt.final.MaxVectorSize >= 16
  *
  * @run driver compiler.vectorapi.VectorMaskCompareNotTest
  */
 
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, 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,7 +39,7 @@
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @summary Test that vector reinterpret intrinsics work as intended.
- * @requires os.arch != "riscv64" | vm.cpu.features ~= ".*rvv.*"
+ * @requires vm.opt.final.MaxVectorSize == null | vm.opt.final.MaxVectorSize >= 16
  * @library /test/lib /
  * @run main compiler.vectorapi.reshape.TestVectorReinterpret
  */
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`* @library /test/lib /`
`36`	`36`	`* @summary test combining vector not operation with compare`
`37`	`37`	`* @modules jdk.incubator.vector`
`38`		`- * @requires vm.opt.final.MaxVectorSize == "null" \| vm.opt.final.MaxVectorSize >= 16`
	`38`	`+ * @requires vm.opt.final.MaxVectorSize == null \| vm.opt.final.MaxVectorSize >= 16`
`39`	`39`	`*`
`40`	`40`	`* @run driver compiler.vectorapi.VectorMaskCompareNotTest`
`41`	`41`	`*/`