diff --git a/libraries/onos.robot b/libraries/onos.robot
index 3a65ec8..31e1c8a 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -51,10 +51,10 @@
     Set Suite Variable    ${of_id}
 
 Verify Eapol Flows Added
-    [Arguments]    ${expected_onus}
+    [Arguments]    ${ip}    ${port}    ${expected_flows}
     [Documentation]    Matches for number of eapol flows based on number of onus
-    ${eapol_flows_added}=    Execute ONOS Command    flows -s -f ADDED | grep eapol | wc -l
-    Should Contain    ${eapol_flows_added}    ${expected_onus}
+    ${eapol_flows_added}=    Execute ONOS Command    ${ip}    ${port}    flows -s -f ADDED | grep eapol | wc -l
+    Should Contain    ${eapol_flows_added}    ${expected_flows}
 
 Verify Number of AAA-Users
     [Arguments]    ${ip}    ${port}    ${expected_onus}
diff --git a/tests/sanity/sanity.robot b/tests/sanity/sanity.robot
index af64f91..819b91a 100644
--- a/tests/sanity/sanity.robot
+++ b/tests/sanity/sanity.robot
@@ -56,8 +56,10 @@
 
 Check EAPOL Flows in ONOS
     [Documentation]    Validates eapol flows for the onu are pushed from voltha
-    [Tags]    sanity    notready
-    Wait Until Keyword Succeeds    ${timeout}    5s    Verify Eapol Flows Added    ${num_onus}
+    [Tags]    sanity
+    ${num_flows}=    Evaluate    ${num_onus} * 4
+    ${flows_str}=    Convert To String    ${num_flows}
+    Wait Until Keyword Succeeds    ${timeout}    5s    Verify Eapol Flows Added    ${server_ip}    ${ONOS_SSH_PORT}    ${flows_str}
 
 Validate ONU Authenticated in ONOS
     [Documentation]    Validates onu is AUTHORIZED in ONOS as bbsim will attempt to authenticate
@@ -109,4 +111,4 @@
 
 Teardown
     [Documentation]    Delete all http sessions
-    Delete All Sessions
\ No newline at end of file
+    Delete All Sessions