diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_6.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_6.yaml
index 7c2e3d25ad65b5..b133e1f77541b9 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_6.yaml
@@ -39,7 +39,7 @@ tests:
       response:
           constraints:
               type: bitmap32
-              hasMasksSet: [0x2]
+              hasMasksSet: [0x4]
 
     - label:
           "Step 2: TH sends On command to the On/Off Cluster of DUT on
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml
index 1884a624800495..3fef023aacc6c3 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml
@@ -28,7 +28,7 @@ tests:
     - label: "Note"
       verification: |
           For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
-          
+
           Execute the below mentioned command to put TH(Reference app) into a commissionable state in RPI platform, Pls use equivalent command on the respective platform
           ./chip-all-clusters-app --trace_decode 1
 
@@ -110,6 +110,14 @@ tests:
           no messages needed, TH checks consistency of PICS flags
       disabled: true
 
+    - label:
+          "Step 0h: FAIL the test - when supporting SWTCH.C.F02(MSR) the
+          SWTCH.C.F05(AS) must not be supported"
+      PICS: SWTCH.C.F02 && SWTCH.C.F05
+      verification: |
+          no messages needed, TH checks consistency of PICS flags
+      disabled: true
+
     - label:
           "Step 1a: Commission DUT to TH. Use client mechanism to set it up so
           switch state can be observed (e.g. UI shows state of switch) and/or