diff --git a/ci/intel-x86-64.yml b/ci/intel-x86-64.yml
index 23e711c..2eda5a4 100644
--- a/ci/intel-x86-64.yml
+++ b/ci/intel-x86-64.yml
@@ -3,4 +3,8 @@ header:
   includes:
     - ci/base.yml
 
+local_conf_header:
+  failing_tests: |
+    ZEPHYRTESTS:remove = "gen_isr_table"
+
 machine: intel-x86-64
diff --git a/ci/mps2-an385.yml b/ci/mps2-an385.yml
index e536118..caa685e 100644
--- a/ci/mps2-an385.yml
+++ b/ci/mps2-an385.yml
@@ -3,4 +3,8 @@ header:
   includes:
     - ci/base.yml
 
+local_conf_header:
+  failing_tests: |
+    ZEPHYRTESTS:remove = "gen_isr_table"
+
 machine: mps2-an385
diff --git a/ci/qemu-cortex-a53.yml b/ci/qemu-cortex-a53.yml
index ca8b649..d959075 100644
--- a/ci/qemu-cortex-a53.yml
+++ b/ci/qemu-cortex-a53.yml
@@ -5,6 +5,6 @@ header:
 
 local_conf_header:
   failing_tests: |
-    ZEPHYRTESTS:remove = "interrupt"
+    ZEPHYRTESTS:remove = "gen_isr_table"
 
 machine: qemu-cortex-a53
diff --git a/ci/qemu-cortex-a9.yml b/ci/qemu-cortex-a9.yml
index cc44730..d75ea4d 100644
--- a/ci/qemu-cortex-a9.yml
+++ b/ci/qemu-cortex-a9.yml
@@ -5,6 +5,6 @@ header:
 
 local_conf_header:
   failing_tests: |
-    ZEPHYRTESTS:remove = "common queue"
+    ZEPHYRTESTS:remove = "common gen_isr_table poll queue"
 
 machine: qemu-cortex-a9
diff --git a/ci/qemu-cortex-r5.yml b/ci/qemu-cortex-r5.yml
index e595bce..6e5ca81 100644
--- a/ci/qemu-cortex-r5.yml
+++ b/ci/qemu-cortex-r5.yml
@@ -3,8 +3,4 @@ header:
   includes:
     - ci/base.yml
 
-local_conf_header:
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "common poll sleep queue device"
-
 machine: qemu-cortex-r5
diff --git a/ci/qemu-nios2.yml b/ci/qemu-nios2.yml
index b818371..30a560a 100644
--- a/ci/qemu-nios2.yml
+++ b/ci/qemu-nios2.yml
@@ -3,8 +3,5 @@ header:
   includes:
     - ci/base.yml
 
-local_conf_header:
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "interrupt"
 
 machine: qemu-nios2
diff --git a/ci/qemu-x86.yml b/ci/qemu-x86.yml
index df744a1..ab92917 100644
--- a/ci/qemu-x86.yml
+++ b/ci/qemu-x86.yml
@@ -5,6 +5,6 @@ header:
 
 local_conf_header:
   failing_tests: |
-    ZEPHYRTESTS:remove = "pending"
+    ZEPHYRTESTS:remove = "gen_isr_table pending"
 
 machine: qemu-x86
diff --git a/ci/v2m-beetle.yml b/ci/v2m-beetle.yml
index df62469..51a4225 100644
--- a/ci/v2m-beetle.yml
+++ b/ci/v2m-beetle.yml
@@ -3,4 +3,8 @@ header:
   includes:
     - ci/base.yml
 
+local_conf_header:
+  failing_tests: |
+    ZEPHYRTESTS:remove = "gen_isr_table"
+
 machine: v2m-beetle
diff --git a/ci/v2m-musca-b1.yml b/ci/v2m-musca-b1.yml
index a867c4c..490f295 100644
--- a/ci/v2m-musca-b1.yml
+++ b/ci/v2m-musca-b1.yml
@@ -3,8 +3,4 @@ header:
   includes:
     - ci/base.yml
 
-local_conf_header:
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "common sleep poll device queue"
-
 machine: v2m-musca-b1
diff --git a/ci/v2m-musca-s1.yml b/ci/v2m-musca-s1.yml
index 01480e2..4451ff0 100644
--- a/ci/v2m-musca-s1.yml
+++ b/ci/v2m-musca-s1.yml
@@ -3,8 +3,4 @@ header:
   includes:
     - ci/base.yml
 
-local_conf_header:
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "common sleep poll device queue"
-
 machine: v2m-musca-s1
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
index 77f45a7..f8ba1ff 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc
@@ -1,16 +1,12 @@
+# Exclude tests that fail to configure
 ZEPHYRTESTS:remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \
     mem_protect mem_slab msgq mutex pipe profiling sched semaphore \
     stack threads tickless timer workq"
 
-# Exclude tests which does not build for various reasons
-ZEPHYRTESTS:remove = "gen_isr_table spinlock smp mp"
-
 # Exclude tests that are not currently compiling
+ZEPHYRTESTS:remove = "mp smp spinlock"
 ZEPHYRTESTS:remove:96b-avenger96 = "common device poll queue sleep"
-ZEPHYRTESTS:remove:96b-nitrogen = "common device poll queue sleep"
-ZEPHYRTESTS:remove:arduino-nano-33-ble = "common device poll queue sleep"
-ZEPHYRTESTS:remove:nrf52840dk-nrf52840 = "common device poll queue sleep"
-ZEPHYRTESTS:remove:qemu-x86 = "common device interrupt poll queue sleep"
+ZEPHYRTESTS:remove:qemu-nios2 = "interrupt"
 ZEPHYRTESTS:remove:stm32mp157c-dk2 = "common device poll queue sleep"
 
 # test_context will fail because QEMU for ARM does not emulate CortexM3 BASEPRI register