diff --git a/arch/nios2/core/irq_manage.c b/arch/nios2/core/irq_manage.c
index 588cc339ef6..fafff1cedbf 100644
--- a/arch/nios2/core/irq_manage.c
+++ b/arch/nios2/core/irq_manage.c
@@ -19,6 +19,7 @@
 #include <sw_isr_table.h>
 #include <logging/kernel_event_logger.h>
 #include <ksched.h>
+#include <kswap.h>
 
 void _irq_spurious(void *unused)
 {
diff --git a/tests/kernel/fatal/prj.conf b/tests/kernel/fatal/prj.conf
index 80aed8ac9ff..88a31e92e06 100644
--- a/tests/kernel/fatal/prj.conf
+++ b/tests/kernel/fatal/prj.conf
@@ -1,2 +1,3 @@
-CONFIG_HW_STACK_PROTECTION=y
+CONFIG_STACK_SENTINEL=y
+CONFIG_HW_STACK_PROTECTION=n
 CONFIG_ZTEST=y