diff --git a/libraries/onu_utilities.robot b/libraries/onu_utilities.robot
index f338699..7f70b11 100755
--- a/libraries/onu_utilities.robot
+++ b/libraries/onu_utilities.robot
@@ -458,7 +458,7 @@
     ...                It checks checks presence/absence of tech profiles and flows depending on must_exist.
     ...                The values/content of tech profiles and flows will be not validated!
     [Arguments]    ${onu_sn}    ${namespace}=default    ${defaultkvstoreprefix}=voltha_voltha    ${must_exist}=True
-    ...            ${check_tcont_map_empty}=False
+    ...            ${check_tcont_map_empty}=False    ${check_default_flow_att}=True
     ${kvstoreprefix}=    Get Kv Store Prefix    ${defaultkvstoreprefix}
     ${etcddata}=    Get ONU Go Adapter ETCD Data    namespace=${namespace}    defaultkvstoreprefix=${kvstoreprefix}
     #prepare result for json convert
@@ -490,7 +490,7 @@
     ...    Get From Dictionary    ${flow_params[0]['vlan_rule_params']}    set_vid
     ${cookie_slice_length}=    Run Keyword If    ${length}>0     Run Keyword If     'cookie_slice' in ${flow_params[0]}
     ...    Get Length    ${cookieslice}
-    Run Keyword If    "${workflow}"=="ATT" and not ${must_exist}    Run Keywords
+    Run Keyword If    "${workflow}"=="ATT" and not ${must_exist} and ${check_default_flow_att}    Run Keywords
     ...    Should Be Equal As Numbers    ${setvid}              4091   AND
     ...    Should Be Equal As Numbers    ${cookie_slice_length}    1   AND
     ...    Should Not Be Empty    ${tp_path}   AND
diff --git a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
index f4e492c..8e04fa6 100755
--- a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
@@ -387,6 +387,7 @@
     FOR  ${onu_sn}  IN  @{List_ONU_Serial}
         Wait Until Keyword Succeeds    ${timeout}    2s    Validate Tech Profiles and Flows in ETCD Data Per Onu
         ...    ${onu_sn}   ${INFRA_NAMESPACE}   ${kvstoreprefix}  must_exist=False    check_tcont_map_empty=True
+        ...    check_default_flow_att=False
     END
     Reconcile Onu Adapter    ${NAMESPACE}    ${usekill2restart}    UNKNOWN
     Current State Test All Onus    tech-profile-config-delete-success