diff --git a/tests/functional/Voltha_ONOSHATests.robot b/tests/functional/Voltha_ONOSHATests.robot
index 928a771..e9ecac8 100644
--- a/tests/functional/Voltha_ONOSHATests.robot
+++ b/tests/functional/Voltha_ONOSHATests.robot
@@ -41,6 +41,7 @@
 ${HELM_CHARTS_DIR}    ~/helm-charts
 ${VOLTHA_POD_NUM}    8
 ${NAMESPACE}      default
+${ONOSSPACE}      infra
 # For below variable value, using deployment name as using grep for
 # parsing radius pod name, we can also use full radius pod name
 ${RESTART_POD_NAME}    radius
@@ -65,8 +66,9 @@
     [Setup]    Start Logging     onosMasterRestart
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    onosMasterRestart
-    ${numOfOnos}=    Wait Until Keyword Succeeds    20s    5s    Get Number of Running Pods Number By Label    default
-    ...    app    onos-onos-classic
+    ${numOfOnos}=    Wait Until Keyword Succeeds    20s    5s    Get Number of Running Pods Number By Label    ${ONOSSPACE}
+    ...    app    onos-classic
+    Should Not Be Equal As Integers    ${numOfOnos}    0    Error fetching number of ONOS instances
     Pass Execution If    ${numOfOnos} == 1    Skipping test: just one instance of ONOS
     Delete All Devices and Verify
     Setup
@@ -82,10 +84,10 @@
         ${of_id}=    Wait Until Keyword Succeeds    360s    15s    Validate OLT Device in ONOS    ${olt_serial_number}
         ${node_id}=    Wait Until Keyword Succeeds    20s    5s    Get Master Instace in ONOS    ${of_id}
         @{onos_id}=    Split String    ${node_id}    -
-        ${podName}=    Catenate    SEPARATOR=-    onos-onos-classic    ${onos_id[1]}
-        Wait Until Keyword Succeeds    ${timeout}    15s    Delete K8s Pods By Name    ${NAMESPACE}    ${podName}
+        ${podName}=    Catenate    SEPARATOR=-    voltha-infra-onos-classic    ${onos_id[1]}
+        Wait Until Keyword Succeeds    ${timeout}    15s    Delete K8s Pods By Name    ${ONOSSPACE}    ${podName}
         Sleep    60s
-        Wait Until Keyword Succeeds    ${timeout}    2s    Validate Pods Status By Name    ${NAMESPACE}
+        Wait Until Keyword Succeeds    ${timeout}    2s    Validate Pods Status By Name    ${ONOSSPACE}
         ...    ${podName}    Running
         # Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable
         Run Keyword If    ${has_dataplane}    Clean Up Linux