diff --git a/tests/functional/Voltha_ONOSHATests.robot b/tests/functional/Voltha_ONOSHATests.robot
index 1a4c728..b2514dd 100644
--- a/tests/functional/Voltha_ONOSHATests.robot
+++ b/tests/functional/Voltha_ONOSHATests.robot
@@ -62,9 +62,11 @@
     ...    Prerequisite : ONUs are authenticated and pingable, thus setup and sanity is performed.
     [Tags]    onosHa   VOL-3436   onosMasterRestart
     [Setup]    Run Keywords    Start Logging    onosMasterRestart
-    ...        AND             Setup
+    #...        AND             Setup
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    onosMasterRestart
+    Delete All Devices and Verify
+    Setup
     Run Keyword If    ${has_dataplane}    Clean Up Linux
     Run Keyword If   '${workflow}' == 'ATT'    Wait Until Keyword Succeeds    ${timeout}    2s    Perform Sanity Test
     Run Keyword If   '${workflow}' == 'DT'    Wait Until Keyword Succeeds    ${timeout}    2s    Perform Sanity Test DT
@@ -84,4 +86,4 @@
 *** Keywords ***
 Setup Suite
     [Documentation]    Set up the test suite
-    Common Test Suite Setup
\ No newline at end of file
+    Common Test Suite Setup