diff --git a/samples/kernel/metairq_dispatch/sample.yaml b/samples/kernel/metairq_dispatch/sample.yaml
index f186b374c7b..201166f7e78 100644
--- a/samples/kernel/metairq_dispatch/sample.yaml
+++ b/samples/kernel/metairq_dispatch/sample.yaml
@@ -3,6 +3,8 @@ sample:
     MetaIRQ thread
   name: MetaIRQ Dispatch
 common:
+  tags:
+    - kernel
   integration_platforms:
     - mps2_an385
     - qemu_x86
@@ -18,5 +20,5 @@ common:
 # sample is designed to demonstrate completely arbitrary CPU work.
 tests:
   sample.kernel.metairq_dispatch:
-    tags: introduction
-    filter: not CONFIG_ARCH_POSIX
+    arch_exclude:
+      - posix
diff --git a/samples/philosophers/sample.yaml b/samples/philosophers/sample.yaml
index 62dd19b7315..5bba6207cd4 100644
--- a/samples/philosophers/sample.yaml
+++ b/samples/philosophers/sample.yaml
@@ -2,7 +2,9 @@ sample:
   name: Dining Philosophers
 common:
   extra_args: DEBUG_PRINTF=1
-  tags: introduction
+  tags:
+    - inroduction
+    - kernel
   harness: console
   integration_platforms:
     - native_posix
@@ -15,8 +17,7 @@ common:
       - ".*THINKING.*"
       - ".*EATING.*"
 tests:
-  sample.kernel.philosopher:
-    tags: introduction
+  sample.kernel.philosopher: {}
   sample.kernel.philosopher.same_prio:
     extra_args: SAME_PRIO=1
   sample.kernel.philosopher.static:
diff --git a/tests/benchmarks/app_kernel/testcase.yaml b/tests/benchmarks/app_kernel/testcase.yaml
index 04ddcc56df2..e54ec1e2d3a 100644
--- a/tests/benchmarks/app_kernel/testcase.yaml
+++ b/tests/benchmarks/app_kernel/testcase.yaml
@@ -1,5 +1,7 @@
 common:
-  tags: benchmark
+  tags:
+    - benchmark
+    - kernel
   timeout: 420
 tests:
   benchmark.kernel.application:
diff --git a/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml b/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml
index f5639eb07ca..f772594cf51 100644
--- a/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml
+++ b/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml
@@ -3,5 +3,6 @@ tests:
     tags:
       - benchmark
       - dlist
+      - kernel
     integration_platforms:
       - native_posix
diff --git a/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml b/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml
index 76d4537eaf9..bee6b9994aa 100644
--- a/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml
+++ b/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml
@@ -3,5 +3,6 @@ tests:
     tags:
       - benchmark
       - rbtree
+      - kernel
     integration_platforms:
       - native_posix
diff --git a/tests/benchmarks/footprints/testcase.yaml b/tests/benchmarks/footprints/testcase.yaml
index 7d4d8deedfa..926b582ddcb 100644
--- a/tests/benchmarks/footprints/testcase.yaml
+++ b/tests/benchmarks/footprints/testcase.yaml
@@ -1,12 +1,14 @@
+common:
+  tags:
+    - benchmark
+    - kernel
 tests:
   benchmark.kernel.footprints.default:
-    tags: benchmark
     build_only: true
     integration_platforms:
       - mps2_an385
   benchmark.kernel.footprints.pm:
     tags:
-      - benchmark
       - pm
     build_only: true
     extra_args: CONF_FILE=prj_pm.conf
@@ -20,7 +22,6 @@ tests:
       - arm
       - arc
     tags:
-      - benchmark
       - userspace
     build_only: true
     integration_platforms:
diff --git a/tests/benchmarks/latency_measure/testcase.yaml b/tests/benchmarks/latency_measure/testcase.yaml
index d63000ba6e0..694a4138130 100644
--- a/tests/benchmarks/latency_measure/testcase.yaml
+++ b/tests/benchmarks/latency_measure/testcase.yaml
@@ -1,3 +1,7 @@
+common:
+  tags:
+    - kernel
+    - benchmark
 tests:
   benchmark.kernel.latency:
     # FIXME: no DWT and no RTC_TIMER for qemu_cortex_m0
@@ -5,7 +9,6 @@ tests:
       - qemu_cortex_m0
       - m2gl025_miv
     filter: CONFIG_PRINTK and not CONFIG_SOC_FAMILY_STM32
-    tags: benchmark
     harness: console
     integration_platforms:
       - qemu_x86
@@ -24,7 +27,6 @@ tests:
   benchmark.kernel.latency.stm32:
     arch_allow: arm
     filter: CONFIG_PRINTK and CONFIG_SOC_FAMILY_STM32
-    tags: benchmark
     extra_configs:
       - CONFIG_SYS_CLOCK_TICKS_PER_SEC=20
     harness: console
diff --git a/tests/benchmarks/sched/testcase.yaml b/tests/benchmarks/sched/testcase.yaml
index a7a1345ca92..6ec2987d335 100644
--- a/tests/benchmarks/sched/testcase.yaml
+++ b/tests/benchmarks/sched/testcase.yaml
@@ -1,6 +1,8 @@
 tests:
   benchmark.kernel.scheduler:
-    tags: benchmark
+    tags:
+      - benchmark
+      - kernel
     integration_platforms:
       - mps2_an385
       - qemu_x86
diff --git a/tests/benchmarks/sched_userspace/testcase.yaml b/tests/benchmarks/sched_userspace/testcase.yaml
index 4c242f9a971..e4da7bc1bcf 100644
--- a/tests/benchmarks/sched_userspace/testcase.yaml
+++ b/tests/benchmarks/sched_userspace/testcase.yaml
@@ -2,6 +2,7 @@ tests:
   benchmark.kernel.scheduler_userspace:
     arch_allow: arm64
     tags:
+      - kernel
       - benchmark
       - userspace
     slow: true
diff --git a/tests/benchmarks/sys_kernel/testcase.yaml b/tests/benchmarks/sys_kernel/testcase.yaml
index 8b1ca6f3b51..3aa22135591 100644
--- a/tests/benchmarks/sys_kernel/testcase.yaml
+++ b/tests/benchmarks/sys_kernel/testcase.yaml
@@ -1,8 +1,9 @@
 tests:
   benchmark.kernel.core:
+    tags:
+      - kernel
     arch_exclude:
       - nios2
       - xtensa
     min_ram: 32
-    tags: benchmark
     timeout: 120