diff --git a/tests/common/utils.py b/tests/common/utils.py
index cb08622d45b..722298e10b7 100644
--- a/tests/common/utils.py
+++ b/tests/common/utils.py
@@ -426,7 +426,7 @@ def load_csv_data(
         for line in schemas.splitlines():
             resp_ok(sess, line.strip(), True)
 
-        # wait heartbeat_interval_secs seconds for schema synchronization
+        # wait heartbeat_interval_secs + 1 seconds for schema synchronization
         time.sleep(2)
 
         for fd in config["files"]:
diff --git a/tests/tck/conftest.py b/tests/tck/conftest.py
index 3f0ead037a8..a4e59db4ca5 100644
--- a/tests/tck/conftest.py
+++ b/tests/tck/conftest.py
@@ -76,7 +76,7 @@ def wait_all_jobs_finished(sess, jobs=[]):
     times = 4 * get_running_jobs(sess)
     while jobs and times > 0:
         jobs = [job for job in jobs if not is_job_finished(sess, job)]
-        time.sleep(0.5)
+        time.sleep(1)
         times -= 1
     return len(jobs) == 0
 
diff --git a/tests/tck/features/index/Index.IntVid.feature b/tests/tck/features/index/Index.IntVid.feature
index a6aa4927ebf..a5534596fcd 100644
--- a/tests/tck/features/index/Index.IntVid.feature
+++ b/tests/tck/features/index/Index.IntVid.feature
@@ -69,21 +69,6 @@ Feature: IndexTest_Vid_Int
         hash("Tom"):  ("Tom",  18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index;
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD TAG INDEX multi_tag_index;
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD TAG INDEX multi_tag_index OFFLINE;
@@ -222,21 +207,6 @@ Feature: IndexTest_Vid_Int
         hash("May")  ->  hash("Tim"):  ("Like", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD EDGE INDEX multi_edge_1_index
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD EDGE INDEX multi_edge_1_index OFFLINE;
@@ -618,7 +588,7 @@ Feature: IndexTest_Vid_Int
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX tag_index_status
@@ -666,7 +636,7 @@ Feature: IndexTest_Vid_Int
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX edge_index_status
diff --git a/tests/tck/features/index/Index.feature b/tests/tck/features/index/Index.feature
index 0813917eacf..432dd06153c 100644
--- a/tests/tck/features/index/Index.feature
+++ b/tests/tck/features/index/Index.feature
@@ -69,21 +69,6 @@ Feature: IndexTest_Vid_String
         "Tom":  ("Tom",  18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index;
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD TAG INDEX single_tag_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD TAG INDEX multi_tag_index;
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD TAG INDEX multi_tag_index OFFLINE;
@@ -222,21 +207,6 @@ Feature: IndexTest_Vid_String
         "May"  -> "Tim":  ("Like", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
       """
     Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index
-      """
-    Then the execution should be successful
-    When executing query:
-      """
-      REBUILD EDGE INDEX single_edge_index OFFLINE;
-      """
-    Then a SyntaxError should be raised at runtime:
-    When executing query:
-      """
-      REBUILD EDGE INDEX multi_edge_1_index
-      """
-    Then the execution should be successful
     When executing query:
       """
       REBUILD EDGE INDEX multi_edge_1_index OFFLINE;
@@ -557,7 +527,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX single_person_index ON tag_1(col1)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -576,7 +546,7 @@ Feature: IndexTest_Vid_String
       CREATE TAG INDEX single_person_index2 ON tag_1(col5)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When try to execute query:
       """
       INSERT VERTEX
@@ -624,7 +594,7 @@ Feature: IndexTest_Vid_String
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD TAG INDEX tag_index_status
@@ -672,7 +642,7 @@ Feature: IndexTest_Vid_String
       """
     Then the result should be, in any order:
       | Name | Index Status |
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
       REBUILD EDGE INDEX edge_index_status
diff --git a/tests/tck/features/index/TagEdgeIndex.feature b/tests/tck/features/index/TagEdgeIndex.feature
index 266cb3c14b8..2412243eb56 100644
--- a/tests/tck/features/index/TagEdgeIndex.feature
+++ b/tests/tck/features/index/TagEdgeIndex.feature
@@ -80,20 +80,10 @@ Feature: tag and edge index tests from pytest
       CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     When submit a job:
       """
-      REBUILD TAG INDEX single_tag_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD TAG INDEX multi_tag_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD TAG INDEX disorder_tag_index
+      REBUILD TAG INDEX single_tag_index, multi_tag_index, disorder_tag_index
       """
     Then wait the job to finish
     When executing query:
@@ -326,21 +316,11 @@ Feature: tag and edge index tests from pytest
       CREATE EDGE INDEX disorder_edge_index ON edge_1(col3, col2)
       """
     Then the execution should be successful
-    And wait 3 seconds
+    And wait 6 seconds
     # Rebuild Edge Index
     When submit a job:
       """
-      REBUILD EDGE INDEX single_edge_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD EDGE INDEX multi_edge_index
-      """
-    Then wait the job to finish
-    When submit a job:
-      """
-      REBUILD EDGE INDEX disorder_edge_index
+      REBUILD EDGE INDEX single_edge_index, multi_edge_index, disorder_edge_index
       """
     Then wait the job to finish
     When executing query:
diff --git a/tests/tck/features/lookup/EdgeIndexFullScan.feature b/tests/tck/features/lookup/EdgeIndexFullScan.feature
index 22dfc781a31..293eaa339e3 100644
--- a/tests/tck/features/lookup/EdgeIndexFullScan.feature
+++ b/tests/tck/features/lookup/EdgeIndexFullScan.feature
@@ -12,7 +12,6 @@ Feature: Lookup edge index full scan
       """
       CREATE EDGE edge_1(col1_str string, col2_int int);
       """
-    And wait 3 seconds
     # index on col1_str
     And having executed:
       """
@@ -23,7 +22,7 @@ Feature: Lookup edge index full scan
       """
       CREATE EDGE INDEX col2_int_index ON edge_1(col2_int)
       """
-    And wait 3 seconds
+    And wait 6 seconds
     And having executed:
       """
       INSERT EDGE
@@ -33,7 +32,6 @@ Feature: Lookup edge index full scan
         '102'->'103':('Yellow', 22),
         '103'->'101':('Blue', 33);
       """
-    And wait 3 seconds
 
   Scenario: Edge with relational RegExp filter[1]
     When executing query:
diff --git a/tests/tck/features/match/SeekById.intVid.feature b/tests/tck/features/match/SeekById.intVid.feature
index 94af09015fb..d1d427c3229 100644
--- a/tests/tck/features/match/SeekById.intVid.feature
+++ b/tests/tck/features/match/SeekById.intVid.feature
@@ -279,22 +279,17 @@ Feature: Match seek by id
       """
       CREATE TAG player(name string, age int);
       """
-    When try to execute query:
-      """
-      INSERT VERTEX player(name, age) VALUES -100:("Tim", 32);
-      """
-    Then the execution should be successful
     When executing query:
       """
       CREATE TAG INDEX player_name_index ON player(name(10));
       """
     Then the execution should be successful
     And wait 6 seconds
-    When submit a job:
+    When try to execute query:
       """
-      REBUILD TAG INDEX player_name_index;
+      INSERT VERTEX player(name, age) VALUES -100:("Tim", 32);
       """
-    Then wait the job to finish
+    Then the execution should be successful
     When executing query:
       """
       MATCH (v) WHERE id(v) == -100 RETURN v;