diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml
index 7ee8cc81f2c..87b1c9d52d4 100644
--- a/samples/matter/light_bulb/sample.yaml
+++ b/samples/matter/light_bulb/sample.yaml
@@ -20,6 +20,13 @@ tests:
       - nrf5340dk_nrf5340_cpuapp
       - nrf7002dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
+  sample.matter.light_bulb.debug.nrf21540ek:
+    build_only: true
+    extra_args: SHIELD=nrf21540ek
+    integration_platforms:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
   # Sample to execute load tests
   sample.matter.light_bulb.persistent_subscriptions:
     build_only: true
diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml
index e97b932040e..51cde3ccf4b 100644
--- a/samples/matter/lock/sample.yaml
+++ b/samples/matter/lock/sample.yaml
@@ -25,13 +25,6 @@ tests:
       - nrf21540dk_nrf52840
     platform_allow: >
       nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.lock.debug.nrf21540ek:
-    build_only: true
-    extra_args: SHIELD=nrf21540ek
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
   sample.matter.lock.switchable_thread.nrf7002_ek:
     build_only: true
     extra_args: SHIELD=nrf7002ek hci_rpmsg_SHIELD=nrf7002ek_coex