diff --git a/test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java b/test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java
index a3f6d3d826c..5838ef5cfb0 100644
--- a/test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java
+++ b/test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java
@@ -594,8 +594,7 @@ public class VectorAlgorithmsImpl {
             IntVector v = IntVector.fromArray(SPECIES_I, a, i);
             var mask = v.compare(VectorOperators.EQ, es);
             if (mask.anyTrue()) {
-                var ml = mask.toLong();
-                return i + Long.numberOfTrailingZeros(ml);
+                return i + mask.firstTrue();
             }
         }
         for (; i < a.length; i++) {
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java b/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java
index 833d3dd764f..d64715b18c0 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java
@@ -594,8 +594,7 @@ public class VectorAlgorithmsImpl {
             IntVector v = IntVector.fromArray(SPECIES_I, a, i);
             var mask = v.compare(VectorOperators.EQ, es);
             if (mask.anyTrue()) {
-                var ml = mask.toLong();
-                return i + Long.numberOfTrailingZeros(ml);
+                return i + mask.firstTrue();
             }
         }
         for (; i < a.length; i++) {