diff --git a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
index 3a5c991d8d..348226ba95 100644
--- a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
+++ b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
@@ -35,6 +35,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.roaringbitmap.longlong.Roaring64NavigableMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.uniffle.common.PartitionRange;
 import org.apache.uniffle.common.RemoteStorageInfo;
@@ -69,6 +71,8 @@
 import static org.mockito.Mockito.when;
 
 public class ShuffleBufferManagerTest extends BufferTestBase {
+  private static final Logger LOG = LoggerFactory.getLogger(ShuffleBufferManagerTest.class);
+
   private ShuffleBufferManager shuffleBufferManager;
   private ShuffleFlushManager mockShuffleFlushManager;
   private ShuffleServer mockShuffleServer;
@@ -653,8 +657,13 @@ private void waitForFlush(
     int retry = 0;
     long committedCount = 0;
     do {
-      committedCount =
-          shuffleFlushManager.getCommittedBlockIds(appId, shuffleId).getLongCardinality();
+      try {
+        committedCount =
+            shuffleFlushManager.getCommittedBlockIds(appId, shuffleId).getLongCardinality();
+      } catch (Throwable e) {
+        // ignore ArrayIndexOutOfBoundsException and ConcurrentModificationException
+        LOG.error("Ignored exception.", e);
+      }
       if (committedCount < expectedBlockNum) {
         Thread.sleep(500);
       }