diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index 5171720..41a2469 100755
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -778,7 +778,7 @@
 
 Test ONU Delete and Auto-Discovery for DT
     [Documentation]    Tests the voltctl delete and Auto-Discovery of the ONU
-    [Tags]    functionalDt    VOL-3098    ONUAutoDiscoveryDt    notready
+    [Tags]    functionalDt    VOL-3098    ONUAutoDiscoveryDt
     [Setup]    Start Logging    ONUAutoDiscoveryDt
     [Teardown]    Run Keywords    Run Keyword If    ${logging}    Collect Logs
     ...           AND             Stop Logging    ONUAutoDiscoveryDt
@@ -791,6 +791,8 @@
         ${dst}=    Set Variable    ${hosts.dst[${I}]}
         ${onu_device_id}=    Get Device ID From SN    ${src['onu']}
         ${of_id}=    Get ofID From OLT List    ${src['olt']}
+        ${onu_port}=    Wait Until Keyword Succeeds    ${timeout}    2s
+        ...    Get ONU Port in ONOS    ${src['onu']}    ${of_id}
         ${nni_port}=    Wait Until Keyword Succeeds    ${timeout}    2s    Get NNI Port in ONOS    ${of_id}
         # Delete ONU and Verify Ping Fails
         Delete Device    ${onu_device_id}
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index ff1a4e5..929cdb8 100755
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -812,7 +812,7 @@
 
 Test ONU Delete and Auto-Discovery
     [Documentation]    Tests the voltctl delete and Auto-Discovery of the ONU
-    [Tags]    functional    VOL-3098    ONUAutoDiscovery    notready
+    [Tags]    functional    VOL-3098    ONUAutoDiscovery
     [Setup]    Run Keywords    Start Logging    ONUAutoDiscovery
     ...        AND             Setup
     [Teardown]    Run Keywords    Collect Logs