diff --git a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java
index fd018243ce1d6..50c6974613951 100644
--- a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaRequestTest.java
@@ -66,7 +66,7 @@ public void testGetErrorResponse() {
             }
         }
 
-        for (short version = STOP_REPLICA.oldestVersion(); version < STOP_REPLICA.latestVersion(); version++) {
+        for (short version = STOP_REPLICA.oldestVersion(); version <= STOP_REPLICA.latestVersion(); version++) {
             StopReplicaRequest.Builder builder = new StopReplicaRequest.Builder(version,
                     0, 0, 0L, false, topicStates);
             StopReplicaRequest request = builder.build();
@@ -93,7 +93,7 @@ private void testBuilderNormalization(boolean deletePartitions) {
         Map<TopicPartition, StopReplicaPartitionState> expectedPartitionStates =
             StopReplicaRequestTest.partitionStates(topicStates);
 
-        for (short version = STOP_REPLICA.oldestVersion(); version < STOP_REPLICA.latestVersion(); version++) {
+        for (short version = STOP_REPLICA.oldestVersion(); version <= STOP_REPLICA.latestVersion(); version++) {
             StopReplicaRequest request = new StopReplicaRequest.Builder(version, 0, 1, 0,
                 deletePartitions, topicStates).build(version);
             StopReplicaRequestData data = request.data();
@@ -128,7 +128,7 @@ private void testBuilderNormalization(boolean deletePartitions) {
     public void testTopicStatesNormalization() {
         List<StopReplicaTopicState> topicStates = topicStates(true);
 
-        for (short version = STOP_REPLICA.oldestVersion(); version < STOP_REPLICA.latestVersion(); version++) {
+        for (short version = STOP_REPLICA.oldestVersion(); version <= STOP_REPLICA.latestVersion(); version++) {
             // Create a request for version to get its serialized form
             StopReplicaRequest baseRequest = new StopReplicaRequest.Builder(version, 0, 1, 0,
                 true, topicStates).build(version);
@@ -163,7 +163,7 @@ public void testTopicStatesNormalization() {
     public void testPartitionStatesNormalization() {
         List<StopReplicaTopicState> topicStates = topicStates(true);
 
-        for (short version = STOP_REPLICA.oldestVersion(); version < STOP_REPLICA.latestVersion(); version++) {
+        for (short version = STOP_REPLICA.oldestVersion(); version <= STOP_REPLICA.latestVersion(); version++) {
             // Create a request for version to get its serialized form
             StopReplicaRequest baseRequest = new StopReplicaRequest.Builder(version, 0, 1, 0,
                 true, topicStates).build(version);
diff --git a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java
index e8ea107f1a913..c3d049d482cc9 100644
--- a/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/requests/StopReplicaResponseTest.java
@@ -44,7 +44,7 @@ public void testErrorCountsFromGetErrorResponse() {
                 new StopReplicaPartitionState().setPartitionIndex(0),
                 new StopReplicaPartitionState().setPartitionIndex(1))));
 
-        for (short version = STOP_REPLICA.oldestVersion(); version < STOP_REPLICA.latestVersion(); version++) {
+        for (short version = STOP_REPLICA.oldestVersion(); version <= STOP_REPLICA.latestVersion(); version++) {
             StopReplicaRequest request = new StopReplicaRequest.Builder(version,
                 15, 20, 0, false, topicStates).build(version);
             StopReplicaResponse response = request