diff --git a/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot b/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
index 2874a82..11c597a 100755
--- a/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
+++ b/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
@@ -193,7 +193,7 @@
     ...    is received at the BNG.
     ...    Then pump ONU2 and ONU3 HSIA combined. ONUs must be share rest of bw in PON Port. (Expect fixed tcont1)
     ...    Note: Currently, only Flex Pod supports the deployment configuration required to test this scenario.
-    [Tags]    functionalTT    VOL-4094
+    [Tags]    functionalTT    VOL-4094    non-critical
     [Setup]    Run Keyword    Start Logging    TcontType1Type4Onu1Onu2Onu3
     [Teardown]    Run Keywords    Run Keyword If    ${logging}    Collect Logs
     ...           AND             Stop Logging    TcontType1Type4Onu1Onu2Onu3
@@ -308,7 +308,7 @@
     ...    Firstly, pump 500Mbps from the RG of ONU1 for the VoD service and
     ...    then verify that close to 500Mbps is received at the BNG.
     ...    Also verify that the VoD rate is now truncated to 500Mbps at BNG for ONU2.
-    [Tags]    functionalTT    VOL-4096
+    [Tags]    functionalTT    VOL-4096    non-critical
     [Setup]    Run Keyword    Start Logging    TcontType2Onu1Type3Onu2
     [Teardown]    Run Keywords    Run Keyword If    ${logging}    Collect Logs
     ...           AND             Stop Logging    TcontType2Onu1Type3Onu2
diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index 70f1ed7..2381375 100755
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -221,7 +221,8 @@
     ...    Perform disable on the ONUs and validate that the pings do not succeed
     ...    Perform enable on the ONUs and validate that the pings are successful
     [Tags]    functionalTT    DisableEnableONUTT
-    [Setup]    Start Logging    DisableEnableONUTT
+    [Setup]    Run Keywords    Start Logging    DisableEnableONUTT
+    ...        AND    Run Keyword If    ${has_dataplane}    Set Non-Critical Tag for XGSPON Tech
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    DisableEnableONUTT
     FOR    ${I}    IN RANGE    0    ${num_all_onus}