diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 7b9ebf1a1a53e6..18c9e4f45b7423 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -3077,9 +3077,6 @@ PICS:
     - label: "Is the device a barrier access device?"
       id: MCORE.DD.DEV_BARRIER
 
-    - label: "Does the device have a vendor specific information element (IE)?"
-      id: MCORE.DD.IE
-
     - label:
           "Does the device or device packaging have a QR code based onboarding
           payload?"
@@ -3521,7 +3518,7 @@ PICS:
     - label:
           "Does the DUT(server) support the Server supports the counts for the
           number of received and transmitted packets feature?"
-      id: DGTHREAD.S.F.00
+      id: DGTHREAD.S.F00
 
     - label:
           "Does the DUT(server) support the Server supports the counts for the
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
index 833409127f6da3..dc946e5a1d2290 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
@@ -18,7 +18,7 @@ name:
     [DUT-Server]
 
 PICS:
-    - CNET.S.S.F00
+    - CNET.S.F00
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml
index 6c7ad1bbae2776..ba6f97ae5c98de 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml
@@ -42,7 +42,7 @@ tests:
 
     - label: "TH reads the FeatureMap from DUT"
       PICS:
-          " !DGTHREAD.S.F.00 && !DGTHREAD.S.F01 && !DGTHREAD.S.F02 &&
+          " !DGTHREAD.S.F00 && !DGTHREAD.S.F01 && !DGTHREAD.S.F02 &&
           !DGTHREAD.S.F03 "
       command: "readAttribute"
       attribute: "FeatureMap"
@@ -52,9 +52,9 @@ tests:
               type: bitmap32
 
     - label:
-          "Given DGTHREAD.S.F.00(PKTCNT) ensure featuremap has the correct bit
+          "Given DGTHREAD.S.F00(PKTCNT) ensure featuremap has the correct bit
           set"
-      PICS: DGTHREAD.S.F.00
+      PICS: DGTHREAD.S.F00
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
index 5e1e29e4de2037..a8e578cbbe51af 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
@@ -48,15 +48,27 @@ tests:
           constraints:
               type: bitmap32
 
-    - label: "TH reads the FeatureMap from DUT"
-      PICS: DGWIFI.S.F00 || DGWIFI.S.F01
+    - label:
+          "Given DGWIFI.S.F00(PacketCounts) ensure featuremap has the correct
+          bit set"
+      PICS: DGWIFI.S.F00
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x1]
+
+    - label:
+          "Given DGWIFI.S.F01(ErrorCounts) ensure featuremap has the correct bit
+          set"
+      PICS: DGWIFI.S.F01
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
           constraints:
               type: bitmap32
-              minValue: 1
-              maxValue: 3
+              hasMasksSet: [0x2]
 
     - label: "TH reads AttributeList from DUT"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index e4f69cfbcd8694..c9821cbbc808d0 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -860,7 +860,6 @@ MCORE.DD.TXT_KEY_VP=1
 MCORE.DD.TXT_KEY_DT=1
 MCORE.DD.DISCOVERY_BLE=1
 MCORE.DD.WIFI=1
-MCORE.DD.IE=1
 MCORE.DD.TXT_KEY_DN=1
 MCORE.DD.TXT_KEY_RI=1
 MCORE.DD.TXT_KEY_PH=1
@@ -971,7 +970,7 @@ PSCFG.S.A0000=1
 
 #Thread Network Diagnostics Cluster
 #Features
-DGTHREAD.S.F.00=1
+DGTHREAD.S.F00=1
 DGTHREAD.S.F01=1
 DGTHREAD.S.F02=1
 DGTHREAD.S.F03=1