diff --git a/tests/functional/Voltha_FailureScenarios.robot b/tests/functional/Voltha_FailureScenarios.robot
index 5049fa7..17977ee 100644
--- a/tests/functional/Voltha_FailureScenarios.robot
+++ b/tests/functional/Voltha_FailureScenarios.robot
@@ -586,7 +586,7 @@
     [Tags]    functional   VOL-2962   ofagentRestart2
     [Setup]    Start Logging    ofagentRestart2
     [Teardown]    Run Keywords    Collect Logs
-    ...           AND             Stop Logging    ofagentRestart
+    ...           AND             Stop Logging    ofagentRestart2
     ...           AND             Scale K8s Deployment    ${NAMESPACE}    voltha-voltha-ofagent    1
     Delete Device And Verify
     setup
diff --git a/tests/functional/Voltha_ONOSHATests.robot b/tests/functional/Voltha_ONOSHATests.robot
index 3303397..9aeba85 100644
--- a/tests/functional/Voltha_ONOSHATests.robot
+++ b/tests/functional/Voltha_ONOSHATests.robot
@@ -61,7 +61,7 @@
     ...    subscriuber still has dataplane traffic.
     ...    Prerequisite : ONUs are authenticated and pingable, thus setup and sanity is performed.
     [Tags]    onosHa   VOL-3436   onosMasterRestart
-    [Setup]    Run Keyword    Start Logging    onosMasterRestart
+    [Setup]    Start Logging     onosMasterRestart
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    onosMasterRestart
     Delete All Devices and Verify