diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
index 22a335e1594e..a0c543d72325 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachine.java
@@ -123,6 +123,9 @@ public void testWriteFailure(boolean failWithException) throws ExecutionExceptio
     RaftProtos.LogEntryProto entry = mock(RaftProtos.LogEntryProto.class);
     when(entry.getTerm()).thenReturn(1L);
     when(entry.getIndex()).thenReturn(1L);
+    RaftProtos.LogEntryProto entryNext = mock(RaftProtos.LogEntryProto.class);
+    when(entryNext.getTerm()).thenReturn(1L);
+    when(entryNext.getIndex()).thenReturn(2L);
     TransactionContext trx = mock(TransactionContext.class);
     ContainerStateMachine.Context context = mock(ContainerStateMachine.Context.class);
     when(trx.getStateMachineContext()).thenReturn(context);
@@ -167,7 +170,7 @@ public void testWriteFailure(boolean failWithException) throws ExecutionExceptio
                     ContainerProtos.DatanodeBlockID.newBuilder().setContainerID(2).setLocalID(1).build()).build())
         .setContainerID(2)
         .setDatanodeUuid(UUID.randomUUID().toString()).build());
-    stateMachine.write(entry, trx).exceptionally(throwableSetter).get();
+    stateMachine.write(entryNext, trx).exceptionally(throwableSetter).get();
     verify(dispatcher, times(0)).dispatch(any(ContainerProtos.ContainerCommandRequestProto.class),
         any(DispatcherContext.class));
     assertInstanceOf(StorageContainerException.class, throwable.get());
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
index 3560353626b9..e63dfac3ffed 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineFollower.java
@@ -17,12 +17,9 @@
 
 package org.apache.hadoop.ozone.container.common.transport.server.ratis;
 
-import org.apache.ozone.test.tag.Flaky;
-
 /**
  * Test class to ContainerStateMachine class for follower.
  */
-@Flaky("HDDS-12602")
 public class TestContainerStateMachineFollower extends TestContainerStateMachine {
   public TestContainerStateMachineFollower() {
     super(false);
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
index b3d4fae6f67d..29ded1465b14 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestContainerStateMachineLeader.java
@@ -17,12 +17,9 @@
 
 package org.apache.hadoop.ozone.container.common.transport.server.ratis;
 
-import org.apache.ozone.test.tag.Flaky;
-
 /**
  * Test class to ContainerStateMachine class for leader.
  */
-@Flaky("HDDS-12602")
 public class TestContainerStateMachineLeader extends TestContainerStateMachine {
   public TestContainerStateMachineLeader() {
     super(true);