diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 6d910b915b2d19..ae3e8212551b0a 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -632,14 +632,6 @@ PICS:
     - label: "Does the device implement the Tolerance attribute?"
       id: A_TEMPERATURE_TOLERANCE
 
-    - label:
-          "Does the device implement the UnoccupiedCoolingSetpoint attribute?"
-      id: A_UNOCCUPIEDCOOLINGSETPOINT
-
-    - label:
-          "Does the device implement the UnoccupiedHeatingSetpoint attribute?"
-      id: A_UNOCCUPIEDHEATINGSETPOINT
-
     - label: "Does the device implement the LocalTemperature attribute?"
       id: TSTAT.S.A0000
 
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 81a76c571605dd..1126573d1d9073 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -58,7 +58,7 @@ MANUAL_FLOW_CHANGE=1
 #Thermostat Server
 TSTAT.S.F00=1
 TSTAT.S.F01=1
-TSTST.S.F02=0
+TSTAT.S.F02=0
 TSTAT.S.F05=1
 A_MINHEATSETPOINTLIMIT=1
 A_MAXHEATSETPOINTLIMIT=1
@@ -1353,10 +1353,3 @@ TSTAT.S.C01.Rsp=1
 TSTAT.S.C02.Rsp=1
 TSTAT.S.C03.Rsp=1
 TSTAT.S.C04.Rsp=1
-#Device capabilities
-TSTAT.S.F00=1
-TSTAT.S.F01=1
-TSTAT.S.F02=1
-TSTAT.S.F03=1
-TSTAT.S.F04=1
-TSTAT.S.F05=1
\ No newline at end of file