diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot
index 7aef0b6af..f9d32dffa 100644
--- a/tests/resources/Harbor-Pages/Replication.robot
+++ b/tests/resources/Harbor-Pages/Replication.robot
@@ -61,9 +61,9 @@ Select Filter Label Model
 
 Select Filter Label
     [Arguments]    ${label}
-    Retry Element Click  ${filter_label_button}
+    Retry Element Click  ${filter_label_xpath}
     Retry Element Click  //div[@class='filterSelect ng-star-inserted'][3]//label[contains(text(), '${label}')]
-    Retry Element Click  ${filter_label_button}
+    Retry Element Click  ${filter_label_xpath}
 
 Select Bandwidth Unit
     [Arguments]    ${unit}
diff --git a/tests/resources/Harbor-Pages/Replication_Elements.robot b/tests/resources/Harbor-Pages/Replication_Elements.robot
index 4144f396a..5d359b696 100644
--- a/tests/resources/Harbor-Pages/Replication_Elements.robot
+++ b/tests/resources/Harbor-Pages/Replication_Elements.robot
@@ -64,7 +64,7 @@ ${replication_mode_radio_pull}  //clr-main-container//hbr-create-edit-rule//labe
 ${filter_name_id}  //input[@id='filter_name']
 ${filter_tag_model_select}  //div[@class='filterSelect ng-star-inserted'][2]//select
 ${filter_tag_id}  //input[@id='filter_tag']
-${filter_label_button}  //div[@class='filterSelect ng-star-inserted'][3]//button
+${filter_label_xpath}  //div//clr-dropdown//div[contains(@class,'label-text')]
 ${filter_label_model_select}  //div[@class='filterSelect ng-star-inserted'][3]//select
 ${rule_resource_selector}  //*[@id='select_resource']
 ${trigger_mode_selector}  //*[@id='ruleTrigger']
diff --git a/tests/resources/Harbor-Pages/Vulnerability.robot b/tests/resources/Harbor-Pages/Vulnerability.robot
index 564d768ba..3539e517d 100644
--- a/tests/resources/Harbor-Pages/Vulnerability.robot
+++ b/tests/resources/Harbor-Pages/Vulnerability.robot
@@ -20,8 +20,7 @@ Set Scan Schedule
 
 Trigger Scan Now And Wait Until The Result Appears
     Retry Element Click  xpath=${scan_now_button}
-    Sleep  60
-    Retry Wait Until Page Contains Element  ${scan_now_result}
+    Retry Action Keyword  Wait Until Element Is Visible And Enabled  ${scan_now_button}
 
 Switch To Vulnerability Page
     Retry Element Click  xpath=//clr-main-container//clr-vertical-nav//a[contains(.,'Interrogation')]
diff --git a/tests/robot-cases/Group1-Nightly/Trivy.robot b/tests/robot-cases/Group1-Nightly/Trivy.robot
index abe960f28..be005f1b3 100644
--- a/tests/robot-cases/Group1-Nightly/Trivy.robot
+++ b/tests/robot-cases/Group1-Nightly/Trivy.robot
@@ -45,6 +45,9 @@ Test Case - Disable Scan Schedule
     Retry Wait Until Page Contains  None
     Close Browser
 
+Test Case - Manual Scan All
+    Body Of Manual Scan All  Critical  High
+
 Test Case - Scan A Tag In The Repo
     Body Of Scan A Tag In The Repo  vmware/photon  1.0
 
@@ -63,22 +66,6 @@ Test Case - Scan As An Unprivileged User
 Test Case - Scan Image With Empty Vul
     Body Of Scan Image With Empty Vul  photon  4.0_scan
 
-Test Case - Manual Scan All
-    Body Of Manual Scan All  Critical  High
-
-#Test Case - View Scan Error
-#    Init Chrome Driver
-#    ${d}=  get current date  result_format=%m%s
-
-#    Sign In Harbor  ${HARBOR_URL}  user026  Test1@34
-#    Create An New Project And Go Into Project  project${d}
-#    Push Image  ${ip}  user026  Test1@34  project${d}  busybox:latest
-#    Go Into Project  project${d}
-#    Go Into Repo  project${d}/busybox
-#    Scan Repo  latest  Fail
-#    View Scan Error Log
-#    Close Browser
-
 Test Case - Scan Image On Push
     [Tags]  run-once
     Body Of Scan Image On Push  Critical  High
@@ -92,9 +79,6 @@ Test Case - Project Level Image Serverity Policy
     Init Chrome Driver
     Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
     ${d}=  get current date  result_format=%m%s
-    #For docker-hub registry
-    #${sha256}=  Set Variable  9755880356c4ced4ff7745bafe620f0b63dd17747caedba72504ef7bac882089
-    #For internal CPE harbor registry
     ${sha256}=  Set Variable  0e67625224c1da47cb3270e7a861a83e332f708d3d89dde0cbed432c94824d9a
     ${image}=  Set Variable  redis
     Create An New Project And Go Into Project  project${d}
@@ -121,4 +105,4 @@ Test Case - Verfiy Project Level CVE Allowlist By Quick Way of Add System
 
 Test Case - Stop Scan And Stop Scan All
     [Tags]  stop_scan_job
-    Body Of Stop Scan And Stop Scan All
+    Body Of Stop Scan And Stop Scan All
\ No newline at end of file