diff --git a/tests/resources/APITest-Util.robot b/tests/resources/APITest-Util.robot
index 1ccb4aa41..bc8c2bacf 100644
--- a/tests/resources/APITest-Util.robot
+++ b/tests/resources/APITest-Util.robot
@@ -9,7 +9,7 @@ Make Swagger Client
     [Return]  ${rc}
 
 Setup API Test
-    Retry Keyword N Times When Error  10  Make Swagger Client
+    Log To Console  Using preinstalled Swagger Client
 
 Harbor API Test
     [Arguments]  ${testcase_name}  &{param}
@@ -24,4 +24,4 @@ Harbor API Test
     ${rc}  ${output}=  Run And Return Rc And Output  SWAGGER_CLIENT_PATH=${current_dir}/harborclient HARBOR_HOST=${ip} DOCKER_USER=${DOCKER_USER} DOCKER_PWD=${DOCKER_PWD} ${param_str} python ${testcase_name}
     ${prev_lvl}  Set Log Level  ${prev_lvl}
     Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
\ No newline at end of file
+    Should Be Equal As Integers  ${rc}  0
diff --git a/tests/resources/Nightly-Util.robot b/tests/resources/Nightly-Util.robot
index be670846a..de921c895 100644
--- a/tests/resources/Nightly-Util.robot
+++ b/tests/resources/Nightly-Util.robot
@@ -21,7 +21,7 @@ ${SSH_USER}  root
 
 *** Keywords ***
 Prepare Test Tools
-    Wait Unitl Command Success  tar zxvf /usr/local/bin/tools.tar.gz -C /usr/local/bin/
+    Log To Console  Using preinstalled toolset
 
 Get And Setup Harbor CA
     [Arguments]  ${ip}  ${HARBOR_PASSWORD}  ${ca_setup_keyword}  ${ip1}==${EMPTY}