diff --git a/libraries/onos.robot b/libraries/onos.robot
index 8ec81db..6416dd2 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -53,7 +53,7 @@
 Verify Eapol Flows Added
     [Arguments]    ${ip}    ${port}    ${expected_flows}
     [Documentation]    Matches for number of eapol flows based on number of onus
-    ${eapol_flows_added}=    Execute ONOS Command    ${ip}    ${port}    flows -s -f ADDED | grep eapol | wc -l
+    ${eapol_flows_added}=    Execute ONOS Command    ${ip}    ${port}    flows -s -f ADDED | grep eapol | grep IN_PORT | wc -l
     Should Contain    ${eapol_flows_added}    ${expected_flows}
 
 Verify Number of AAA-Users
@@ -68,4 +68,4 @@
     [Documentation]    Matches for number of dhcpacks based on number of onus
     ##TODO: filter by onu serial number instead of count
     ${allocations}=    Execute ONOS Command    ${ip}    ${port}    dhcpl2relay-allocations | grep DHCPACK | wc -l
-    Should Contain    ${allocations}    ${expected_onus}
\ No newline at end of file
+    Should Contain    ${allocations}    ${expected_onus}
diff --git a/tests/Voltha_PODTests.robot b/tests/Voltha_PODTests.robot
index 08239ee..412f8ec 100644
--- a/tests/Voltha_PODTests.robot
+++ b/tests/Voltha_PODTests.robot
@@ -50,11 +50,11 @@
     #[Setup]    Clean Up Linux
     [Tags]    test1
     ${of_id}=    Wait Until Keyword Succeeds    60s    15s    Validate OLT Device in ONOS   ${olt_serial_number}
-    Wait Until Keyword Succeeds    60s    2s    Check EAPOL Flows in ONOS
+    Wait Until Keyword Succeeds    60s    2s    Verify Eapol Flows Added   ${k8s_node_ip}    ${ONOS_PORT}    5
     Validate Authentication    True    ${src0['dp_iface_name']}    wpa_supplicant.conf    ${src0['ip']}    ${src0['user']}    ${src0['pass']}    ${src0['container_type']}    ${src0['container_name']}
     #Validate ONU authenticated in ONOS
-    Wait Until Keyword Succeeds    90s    2s    Verify Number of AAA-Users    ${k8s_node_ip}    ${ONOS_SSH_PORT}    ${num_onus}
-    Wait Until Keyword Succeeds    60s    2s    Execute ONOS Command    ${k8s_node_ip}    ${ONOS_SSH_PORT}    volt-add-subscriber-access ${of_id} 16
+    Wait Until Keyword Succeeds    90s    2s    Verify Number of AAA-Users    ${k8s_node_ip}    ${ONOS_PORT}    ${num_onus}
+    Wait Until Keyword Succeeds    60s    2s    Execute ONOS Command    ${k8s_node_ip}    ${ONOS_PORT}    volt-add-subscriber-access ${of_id} 16
     # Perform dhclient and ping operations
     Validate DHCP and Ping    True    True    ${src0['dp_iface_name']}    ${src0['s_tag']}    ${src0['c_tag']}    ${dst0['dp_iface_ip_qinq']}    ${src0['ip']}    ${src0['user']}    ${src0['pass']}    ${src0['container_type']}    ${src0['container_name']}    ${dst0['dp_iface_name']}    ${dst0['ip']}    ${dst0['user']}    ${dst0['pass']}    ${dst0['container_type']}    ${dst0['container_name']}
     #Validate DHCP allocation in ONOS
diff --git a/variables/variables.robot b/variables/variables.robot
index 6e4d1cb..3afc614 100644
--- a/variables/variables.robot
+++ b/variables/variables.robot
@@ -19,5 +19,6 @@
 ${BBSIM_OLT_SN}         BBSIMOLT000
 ${BBSIM_ONU_SN}         BBSM00000001
 ${ONOS_REST_PORT}       8181
+${ONOS_PORT}            30115
 ${ONOS_SSH_PORT}        8101
 ${OLT_PORT}             9191