diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
index 970d252bbc6029..92515bbca22187 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
@@ -24,6 +24,10 @@ config:
     timeout: 400
     endpoint: 1
 
+    PIXIT.OO.MaxCommunicationTurnaround:
+        type: int16u
+        defaultValue: 10
+
 tests:
     - label: "1: Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
@@ -292,14 +296,15 @@ tests:
       response:
           value: 1
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404396743
     - label: "9b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
       PICS: OO.S.A4001 && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 2 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "9b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
@@ -387,14 +392,15 @@ tests:
       response:
           value: 1
 
+    #Refer comment: https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404397738
     - label: "10e:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
       PICS: OO.S.A4001 && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 2 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "10e:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
@@ -435,14 +441,15 @@ tests:
       response:
           value: 0
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404400479
     - label: "11b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
       PICS: OO.S.A4002 && OO.S.C40.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 3 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "Wait 10000ms"
       cluster: "DelayCommands"
@@ -478,14 +485,15 @@ tests:
       response:
           value: 0
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404406872
     - label: "12b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
       PICS: OO.S.A4002 && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 170
-              maxValue: 230
+              minValue: 185 - ( 7 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 215
 
     - label: "Wait 10000ms"
       cluster: "DelayCommands"
@@ -566,14 +574,15 @@ tests:
       response:
           value: 0
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404423488
     - label: "14c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
       PICS: OO.S.A4002 && OO.S.C00.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 3 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "Wait 30000ms"
       cluster: "DelayCommands"
@@ -676,14 +685,15 @@ tests:
       response:
           value: 1
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404424832
     - label: "17c:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
       PICS: OO.S.A4001 && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 2 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "17c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
@@ -748,14 +758,15 @@ tests:
       response:
           value: 1
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404425845
     - label: "18b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
       PICS: OO.S.A4001 && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 2 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "18b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
@@ -811,14 +822,15 @@ tests:
       response:
           value: 1
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404428940
     - label: "19c:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
       PICS: OO.S.A4001 && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 170
-              maxValue: 230
+              minValue: 185 - ( 2 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 215
 
     - label: "19c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
@@ -845,14 +857,15 @@ tests:
       response:
           value: 0
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404430203
     - label: "20b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
       PICS: OO.S.A4002 && OO.S.C00.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 3 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "21a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
@@ -888,14 +901,15 @@ tests:
       response:
           value: 0
 
+    #Refer comment https://github.com/project-chip/connectedhomeip/pull/30636#discussion_r1404431785
     - label: "21b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
       PICS: OO.S.A4002 && PICS_SKIP_SAMPLE_APP && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 170
-              maxValue: 230
+              minValue: 185 - ( 7 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 215
 
     - label: "22a:Send On Command"
       PICS: OO.S.C01.Rsp
@@ -966,8 +980,8 @@ tests:
       PICS: OO.S.A4002 && OO.S.C00.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 3 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "Wait 40000ms"
       cluster: "DelayCommands"
@@ -1023,8 +1037,8 @@ tests:
       PICS: OO.S.A4001 && OO.S.C42.Rsp
       response:
           constraints:
-              minValue: 255
-              maxValue: 345
+              minValue: 300 - ( 2 * PIXIT.OO.MaxCommunicationTurnaround )
+              maxValue: 300
 
     - label: "24b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"