diff --git a/tests/dt-workflow/Voltha_DT_FailureScenarios.robot b/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
index 6020929..5233544 100755
--- a/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
+++ b/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
@@ -562,7 +562,7 @@
     [Documentation]    Restart openonu-adapter container after VOLTHA is operational.
     ...    Run the ping continuously in background during container restart,
     ...    and verify that there should be no affect on the dataplane.
-    [Tags]    functionalDt   RestartOpenOnuPingDt    non-critical
+    [Tags]    functionalDt    RestartOpenOnuPingDt    non-critical    notready
     [Setup]    Start Logging    RestartOpenOnuPingDt
     [Teardown]    Run Keywords    Run Keyword If    ${logging}    Collect Logs
     ...           AND             Stop Logging    RestartOpenOnuPingDt
@@ -595,11 +595,15 @@
     FOR    ${I}    IN RANGE    0    ${num_all_onus}
         ${src}=    Set Variable    ${hosts.src[${I}]}
         ${dst}=    Set Variable    ${hosts.dst[${I}]}
-        ${ping_output_file}=    Set Variable    /tmp/${src['onu']}_ping
         Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure
         ...    Wait Until Keyword Succeeds    60s    2s
         ...    Stop Ping Running In Background    ${src['ip']}    ${src['user']}    ${src['pass']}
         ...    ${src['container_type']}    ${src['container_name']}
+    END
+    FOR    ${I}    IN RANGE    0    ${num_all_onus}
+        ${src}=    Set Variable    ${hosts.src[${I}]}
+        ${dst}=    Set Variable    ${hosts.dst[${I}]}
+        ${ping_output_file}=    Set Variable    /tmp/${src['onu']}_ping
         ${ping_output}=    Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure
         ...    Wait Until Keyword Succeeds    60s    2s
         ...    Retrieve Remote File Contents    ${ping_output_file}    ${src['ip']}    ${src['user']}    ${src['pass']}
@@ -611,7 +615,7 @@
     [Documentation]    Restart openolt-adapter container after VOLTHA is operational.
     ...    Run the ping continuously in background during container restart,
     ...    and verify that there should be no affect on the dataplane.
-    [Tags]    functionalDt   RestartOpenOltPingDt    non-critical
+    [Tags]    functionalDt    RestartOpenOltPingDt    non-critical    notready
     [Setup]    Start Logging    RestartOpenOltPingDt
     [Teardown]    Run Keywords    Run Keyword If    ${logging}    Collect Logs
     ...           AND             Stop Logging    RestartOpenOltPingDt
@@ -644,11 +648,15 @@
     FOR    ${I}    IN RANGE    0    ${num_all_onus}
         ${src}=    Set Variable    ${hosts.src[${I}]}
         ${dst}=    Set Variable    ${hosts.dst[${I}]}
-        ${ping_output_file}=    Set Variable    /tmp/${src['onu']}_ping
         Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure
         ...    Wait Until Keyword Succeeds    60s    2s
         ...    Stop Ping Running In Background    ${src['ip']}    ${src['user']}    ${src['pass']}
         ...    ${src['container_type']}    ${src['container_name']}
+    END
+    FOR    ${I}    IN RANGE    0    ${num_all_onus}
+        ${src}=    Set Variable    ${hosts.src[${I}]}
+        ${dst}=    Set Variable    ${hosts.dst[${I}]}
+        ${ping_output_file}=    Set Variable    /tmp/${src['onu']}_ping
         ${ping_output}=    Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure
         ...    Wait Until Keyword Succeeds    60s    2s
         ...    Retrieve Remote File Contents    ${ping_output_file}    ${src['ip']}    ${src['user']}    ${src['pass']}