diff --git a/tests/resources/Harbor-Pages/Job_Service_Dashboard.robot b/tests/resources/Harbor-Pages/Job_Service_Dashboard.robot
index d9fc04c61..4349818de 100644
--- a/tests/resources/Harbor-Pages/Job_Service_Dashboard.robot
+++ b/tests/resources/Harbor-Pages/Job_Service_Dashboard.robot
@@ -85,7 +85,7 @@ Check Pending Job Card
 Check Jobs Latency
     [Arguments]  &{jobs_type_is_zore}
     FOR  ${job_type}  IN  @{jobs_type_is_zore.keys()}
-        ${latency_xpath}=  Set Variable  //clr-datagrid//clr-dg-row[contains(.,'${job_type}')]//clr-dg-cell[3][text()='0']
+        ${latency_xpath}=  Set Variable  //clr-datagrid//clr-dg-row[contains(.,'${job_type}')]//clr-dg-cell[3]//span[text()='0']
         Run Keyword If  ${jobs_type_is_zore['${job_type}']}==${true}  Retry Wait Until Page Contains Element  ${latency_xpath}
         ...  ELSE  Retry Wait Until Page Not Contains Element  ${latency_xpath}
     END
diff --git a/tests/resources/TestCaseBody.robot b/tests/resources/TestCaseBody.robot
index a0eb358f3..dfdf736f3 100644
--- a/tests/resources/TestCaseBody.robot
+++ b/tests/resources/TestCaseBody.robot
@@ -507,7 +507,7 @@ Verify Webhook By Tag Retention Finished Event
     &{tag_retention_finished_property}=  Create Dictionary  type=TAG_RETENTION  operator=MANUAL  project_name=${project_name}  name_tag=${image}:${tag2}  status=SUCCESS
     Verify Request  &{tag_retention_finished_property}
 
-Verify Webhook By Replication Finished Event
+Verify Webhook By Replication Status Changed Event
     [Arguments]  ${project_name}  ${project_dest_name}  ${replication_rule_name}  ${harbor_handle}  ${webhook_handle}
     Switch Window  ${webhook_handle}
     Delete All Requests
diff --git a/tests/robot-cases/Group1-Nightly/Webhook.robot b/tests/robot-cases/Group1-Nightly/Webhook.robot
index 55048d1ed..4cd9c8855 100644
--- a/tests/robot-cases/Group1-Nightly/Webhook.robot
+++ b/tests/robot-cases/Group1-Nightly/Webhook.robot
@@ -106,7 +106,7 @@ Test Case - Tag Retention And Replication Event Type Webhook Functionality
     Add A Tag Retention Rule
     Edit A Tag Retention Rule  **  ${tag1}
     Switch To Project Webhooks
-    ${event_type}  Create List  Tag retention finished  Replication finished
+    ${event_type}  Create List  Tag retention finished  Replication status changed
     Create A New Webhook  webhook${d}  ${webhook_endpoint_url}  ${event_type}
     Switch To Registries
     Create A New Endpoint  harbor  e${d}  https://${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
@@ -117,8 +117,8 @@ Test Case - Tag Retention And Replication Event Type Webhook Functionality
     ${harbor_handle}=  Set Variable  ${handles}[1]
     # Tag retention finished
     Retry Action Keyword  Verify Webhook By Tag Retention Finished Event  project${d}  ${image}  ${tag1}  ${tag2}  ${harbor_handle}  ${webhook_handle}
-    # Replication finished
-    Retry Action Keyword  Verify Webhook By Replication Finished Event  project${d}  project_push_dest${d}  rule_push_${d}  ${harbor_handle}  ${webhook_handle}
+    # Replication status changed
+    Retry Action Keyword  Verify Webhook By Replication Status Changed Event  project${d}  project_push_dest${d}  rule_push_${d}  ${harbor_handle}  ${webhook_handle}
     Close Browser
 
 Test Case - Tag Quota Event Type Webhook Functionality
@@ -132,4 +132,4 @@ Test Case - Tag Quota Event Type Webhook Functionality
     ${webhook_handle}=  Set Variable  ${handles}[0]
     ${harbor_handle}=  Set Variable  ${handles}[1]
     Retry Action Keyword  Verify Webhook By Quota Near Threshold Event And Quota Exceed Event  ${webhook_endpoint_url}  ${harbor_handle}  ${webhook_handle}
-    Close Browser
\ No newline at end of file
+    Close Browser