diff --git a/tests/robot-cases/Group1-Nightly/Schedule.robot b/tests/robot-cases/Group1-Nightly/Schedule.robot
index 3e30406c6..742899cd7 100644
--- a/tests/robot-cases/Group1-Nightly/Schedule.robot
+++ b/tests/robot-cases/Group1-Nightly/Schedule.robot
@@ -59,7 +59,7 @@ Test Case - Scan Schedule Job
     Go Into Project  ${project_name}
     Go Into Repo  ${project_name}/${image}
     Scan Result Should Display In List Row  ${tag}
-    View Repo Scan Details  Critical  High  Medium
+    View Repo Scan Details  High  Medium
 
 Test Case - Replication Schedule Job
     Init Chrome Driver
diff --git a/tests/robot-cases/Group1-Nightly/Trivy.robot b/tests/robot-cases/Group1-Nightly/Trivy.robot
index e66841e42..2f007189f 100644
--- a/tests/robot-cases/Group1-Nightly/Trivy.robot
+++ b/tests/robot-cases/Group1-Nightly/Trivy.robot
@@ -65,28 +65,28 @@ Test Case - Scan Image With Empty Vul
     Body Of Scan Image With Empty Vul  photon  2.0_scan
 
 Test Case - Manual Scan All
-    Body Of Manual Scan All  Critical  High  Medium
+    Body Of Manual Scan All  High  Medium
 
-Test Case - View Scan Error
-    Init Chrome Driver
-    ${d}=  get current date  result_format=%m%s
+#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
+#    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  Medium
+    Body Of Scan Image On Push  High  Medium
 
 Test Case - View Scan Results
     [Tags]  run-once
-    Body Of View Scan Results  Critical  High
+    Body Of View Scan Results  High
 
 Test Case - Project Level Image Serverity Policy
     [Tags]  run-once
diff --git a/tests/robot-cases/Group1-Nightly/multi_scanners.robot b/tests/robot-cases/Group1-Nightly/multi_scanners.robot
index af53d0da5..b8f0a2a40 100644
--- a/tests/robot-cases/Group1-Nightly/multi_scanners.robot
+++ b/tests/robot-cases/Group1-Nightly/multi_scanners.robot
@@ -41,8 +41,9 @@ Test Case - Switch Scanner
     Push Image  ${ip}  admin  Harbor12345  project${d}  hello-world:latest
     Go Into Project  project${d}
     Go Into Repo  project${d}/hello-world
-    Scan Repo  latest  Fail
-    View Scan Error Log
+    Scan Repo  latest  Succeed
+    Move To Summary Chart
+    Wait Until Page Contains  No vulnerability
 
     Switch To Scanners Page
 
@@ -51,6 +52,7 @@ Test Case - Switch Scanner
 
     Go Into Project  project${d}
     Go Into Repo  project${d}/hello-world
+    Retry Wait Until Page Contains Element  ${not_scanned_icon}
     Scan Repo  latest  Succeed
     Move To Summary Chart
     Wait Until Page Contains  No vulnerability