diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorExpressionFuzzer.java b/test/hotspot/jtreg/compiler/vectorapi/VectorExpressionFuzzer.java
index 12615d839ab..cb5b95109f5 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorExpressionFuzzer.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorExpressionFuzzer.java
@@ -22,26 +22,17 @@
  */
 
 /*
- * @test id=AVX2
- * @bug 8369699
+ * @test
+ * @bug 8369699 8381618
  * @key randomness
  * @summary Test the Template Library's expression generation for the Vector API.
- * @requires os.family == "linux" & os.simpleArch == "x64"
  * @modules jdk.incubator.vector
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
  * @compile ../../compiler/lib/verify/Verify.java
- * @run driver ${test.main.class} -XX:UseAVX=2
+ * @run driver ${test.main.class}
  */
 
-// TODO: remove the x64 and linux restriction above. I added that for now so we are not flooded
-//       with failures in the CI. We should remove these restriction once more bugs are fixed.
-//       x64 linux is the easiest to debug on for me, that's why I picked it.
-//       In addition, I put a UseAVX=2 restriction below, to avoid AVX512 bugs for now.
-//
-//       A trick to extend this to other platforms: create a new run block, so you have full
-//       freedom to restrict it as necessary for platform and vector features.
-//
 // TODO: Some compilation bailouts are to be expected, for example, we've encountered this before:
 //         COMPILE SKIPPED: out of virtual registers in LIR generator (retry at different tier)
 //       Which manifested in: