diff --git a/libraries/utils.robot b/libraries/utils.robot
index 682e9b5..c0a146d 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -24,6 +24,7 @@
 Library           OperatingSystem
 Library           CORDRobot
 Library           ImportResource    resources=CORDRobot
+Resource          ./libraries/voltctl.robot
 
 *** Keywords ***
 Check CLI Tools Configured
@@ -436,9 +437,10 @@
     ...    volt-add-subscriber-access ${of_id} ${onu_port}
     Sleep    30s
     # Verify ONU state in voltha
+    ${onu_reasons}=  Create List     tech-profile-config-download-success    omci-flows-pushed
     Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s    Validate Device
     ...    ENABLED    ACTIVE    REACHABLE
-    ...    ${src['onu']}    onu=True    onu_reason=omci-flows-pushed
+    ...    ${src['onu']}    onu=True    onu_reason=${onu_reasons}
     # TODO: Yet to Verify on the GPON based Physical POD (VOL-2652)
     Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure    Validate DHCP and Ping    True
     ...    True    ${src['dp_iface_name']}    ${src['s_tag']}    ${src['c_tag']}    ${dst['dp_iface_ip_qinq']}
@@ -512,9 +514,10 @@
     ...    volt-add-subscriber-access ${of_id} ${onu_port}
     Sleep    30s
     # Verify ONU state in voltha
+    ${onu_reasons}=  Create List     tech-profile-config-download-success    omci-flows-pushed
     Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s    Validate Device
     ...    ENABLED    ACTIVE    REACHABLE
-    ...    ${src['onu']}    onu=True    onu_reason=omci-flows-pushed
+    ...    ${src['onu']}    onu=True    onu_reason=${onu_reasons}
 
     # Setup iperf on the BNG
     ${server_output}=    Login And Run Command On Remote System
diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index a7158d6..6e67aad 100755
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -205,7 +205,7 @@
     ...    values=False
     Should Be Equal    '${cstatus}'    '${connect_status}'    Device ${sn} conn_status != ${connect_status}
     ...    values=False
-    Run Keyword If    '${onu}' == 'True'    Should Be Equal    '${mib_state}'    '${onu_reason}'
+    Run Keyword If    '${onu}' == 'True'    Should Contain    '${onu_reason}'   '${mib_state}'
     ...    Device ${sn} mib_state incorrect (${mib_state}) values=False
 
 Validate OLT Device