diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
index bd593dadbf973c..6dfe78a4859d2f 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
@@ -35,6 +35,7 @@ tests:
 
     - label: "Create new user"
       command: "SetUser"
+      PICS: DRLK.S.F08 && DRLK.S.F00
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
@@ -55,6 +56,7 @@ tests:
 
     - label: "Read the user back and verify its fields"
       command: "GetUser"
+      PICS: DRLK.S.F08 && DRLK.S.F00
       arguments:
           values:
               - name: "UserIndex"
@@ -84,6 +86,7 @@ tests:
 
     - label: "Create new PIN credential and lock/unlock user"
       command: "SetCredential"
+      PICS: DRLK.S.F08 && DRLK.S.F00
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
@@ -109,6 +112,7 @@ tests:
                 value: 2
 
     - label: "Verify created PIN credential"
+      PICS: DRLK.S.F08 && DRLK.S.F00
       command: "GetCredentialStatus"
       arguments:
           values:
@@ -183,7 +187,7 @@ tests:
     - label:
           "Step 2b: TH sends the Unlock with Timeout argument value as 60
           seconds"
-      PICS: DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP
+      PICS: " DRLK.S.F08 && DRLK.S.F00 && DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP "
       command: "UnlockWithTimeout"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -193,6 +197,17 @@ tests:
               - name: "PINCode"
                 value: "123456"
 
+    - label:
+          "Step 2b: TH sends the Unlock with Timeout argument value as 60
+          seconds"
+      PICS: " (!DRLK.S.F08 || !DRLK.S.F00) && DRLK.S.C03.Rsp && PICS_SKIP_SAMPLE_APP "
+      command: "UnlockWithTimeout"
+      timedInteractionTimeoutMs: 1000
+      arguments:
+          values:
+              - name: "Timeout"
+                value: 60
+
     - label: "Wait for AutoRelockTime Expires"
       cluster: "DelayCommands"
       command: "WaitForMs"
@@ -221,6 +236,7 @@ tests:
 
     - label: "Cleanup the created user"
       command: "ClearUser"
+      PICS: DRLK.S.F08 && DRLK.S.F00
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
@@ -228,7 +244,7 @@ tests:
                 value: 1
 
     - label: "Clean the created credential"
-      PICS: DRLK.S.C26.Rsp
+      PICS: DRLK.S.F08 && DRLK.S.F00 && DRLK.S.C26.Rsp
       command: "ClearCredential"
       timedInteractionTimeoutMs: 1000
       arguments: