diff --git a/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java b/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java
index b85a2374cf0..20c921b75b4 100644
--- a/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java
+++ b/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 3)