diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
index a85f80ca373d..b5563eeb18d4 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteBlocksCommandHandler.java
@@ -468,6 +468,8 @@ public void testDeleteBlockCommandHandleWhenDeleteCommandQueuesFull()
     dnConf.setBlockDeleteQueueLimit(blockDeleteQueueLimit);
     handler = new DeleteBlocksCommandHandler(
         container, configuration, dnConf, "");
+    // Stop the worker so that handle() can fill the queue without commands being consumed.
+    handler.stop();
 
     // Check if the command status is as expected: PENDING when queue is not full, FAILED when queue is full
     for (int i = 0; i < blockDeleteQueueLimit + 2; i++) {
@@ -482,6 +484,7 @@ public void testDeleteBlockCommandHandleWhenDeleteCommandQueuesFull()
         assertEquals(cmdStatus.getProtoBufMessage().getBlockDeletionAck().getResultsCount(), 0);
       }
     }
+    assertEquals(blockDeleteQueueLimit, handler.getQueuedCount());
   }
 
   @ContainerTestVersionInfo.ContainerTest