diff --git a/regression-test/suites/fault_injection_p0/test_build_index_with_clone_fault.groovy b/regression-test/suites/fault_injection_p0/test_build_index_with_clone_fault.groovy
index 156a582f55362b..ec175792d48de3 100644
--- a/regression-test/suites/fault_injection_p0/test_build_index_with_clone_fault.groovy
+++ b/regression-test/suites/fault_injection_p0/test_build_index_with_clone_fault.groovy
@@ -60,8 +60,8 @@ suite("test_build_index_with_clone_fault_injection", "nonConcurrent"){
             if (show_build_index && show_build_index.size() > 0) {
                 def currentState = show_build_index[0].State
                 def currentMsg = show_build_index[0].Msg
-                if (currentState == expectedState && currentMsg == expectedMsg) {
-                    logger.info("Attempt ${attempt + 1}: State and Msg match expected values.")
+                if ((currentState == expectedState && currentMsg == expectedMsg) || currentState == "FINISHED") {
+                    logger.info(currentState+" "+currentMsg)
                     return
                 } else {
                     logger.warn("Attempt ${attempt + 1}: Expected State='${expectedState}' and Msg='${expectedMsg}', but got State='${currentState}' and Msg='${currentMsg}'. Retrying after ${waitSeconds} second(s)...")
@@ -109,10 +109,8 @@ suite("test_build_index_with_clone_fault_injection", "nonConcurrent"){
         // create index on table 
         sql """ create index idx_k2 on ${tbl}(k2) using inverted """
         sql """ build index idx_k2 on ${tbl} """
-        // sleep 5s to wait for the build index job report table is unstable
-        sleep(5000)
 
-        assertShowBuildIndexWithRetry(tbl, 'WAITING_TXN', 'table is unstable', 3, 5)
+        assertShowBuildIndexWithRetry(tbl, 'WAITING_TXN', 'table is unstable', 3, 10)
 
         def state = wait_for_last_build_index_on_table_finish(tbl, timeout)
         assertEquals(state, "FINISHED")