diff --git a/tests/Kconfig b/tests/Kconfig
index 4ac362705b7..0b1cfb8a215 100644
--- a/tests/Kconfig
+++ b/tests/Kconfig
@@ -8,4 +8,9 @@ menu Testing
 
 source "tests/ztest/Kconfig"
 
+config TEST_EXTRA_STACKSIZE
+	int "Test function thread stack size"
+	default 0
+	default 768 if XTENSA
+
 endmenu
diff --git a/tests/kernel/context/src/context.c b/tests/kernel/context/src/context.c
index ebd9cdb44d4..528338d614d 100644
--- a/tests/kernel/context/src/context.c
+++ b/tests/kernel/context/src/context.c
@@ -30,7 +30,7 @@
 #include <board.h>
 #endif
 
-#define THREAD_STACKSIZE    384
+#define THREAD_STACKSIZE    (384 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define THREAD_PRIORITY     4
 
 #define THREAD_SELF_CMD    0
diff --git a/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c b/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c
index 104cf05bb18..acedb9438f2 100644
--- a/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c
+++ b/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c
@@ -18,7 +18,7 @@
 
 #include "test_fifo.h"
 
-#define STACK_SIZE 512
+#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define LIST_LEN 2
 /**TESTPOINT: init via K_FIFO_DEFINE*/
 K_FIFO_DEFINE(kfifo);
diff --git a/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c b/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c
index 41ae571aaa4..bb1cca0becf 100644
--- a/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c
+++ b/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c
@@ -28,7 +28,7 @@
 
 #include "test_fifo.h"
 
-#define STACK_SIZE 512
+#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define LIST_LEN 4
 #define LOOPS 32
 
diff --git a/tests/kernel/lifo/test_lifo_api/src/test_lifo_contexts.c b/tests/kernel/lifo/test_lifo_api/src/test_lifo_contexts.c
index 8e04f605616..06f75bbc7c3 100644
--- a/tests/kernel/lifo/test_lifo_api/src/test_lifo_contexts.c
+++ b/tests/kernel/lifo/test_lifo_api/src/test_lifo_contexts.c
@@ -19,7 +19,7 @@
 
 #include "test_lifo.h"
 
-#define STACK_SIZE 512
+#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define LIST_LEN 2
 /**TESTPOINT: init via K_LIFO_DEFINE*/
 K_LIFO_DEFINE(klifo);
diff --git a/tests/kernel/lifo/test_lifo_api/src/test_lifo_loop.c b/tests/kernel/lifo/test_lifo_api/src/test_lifo_loop.c
index 87af01f4f85..c10671c67d3 100644
--- a/tests/kernel/lifo/test_lifo_api/src/test_lifo_loop.c
+++ b/tests/kernel/lifo/test_lifo_api/src/test_lifo_loop.c
@@ -28,7 +28,7 @@
 
 #include "test_lifo.h"
 
-#define STACK_SIZE 512
+#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define LIST_LEN 4
 #define LOOPS 32
 
diff --git a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
index d6a10098cfe..0681d8184f9 100644
--- a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
+++ b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
@@ -23,7 +23,7 @@
 #include <ztest.h>
 
 #define TIMEOUT 100
-#define STACK_SIZE 512
+#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define MAIL_LEN 64
 
 
diff --git a/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c b/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c
index 0b02a21d802..a0230714670 100644
--- a/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c
+++ b/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c
@@ -35,7 +35,7 @@
 #include <ztest.h>
 #include <atomic.h>
 #define THREAD_NUM 4
-#define STACK_SIZE 512
+#define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define POOL_NUM 2
 #define TIMEOUT 200
 #define BLK_SIZE_MIN 4
diff --git a/tests/kernel/threads_customdata/cdata_api/src/test_customdata_api.c b/tests/kernel/threads_customdata/cdata_api/src/test_customdata_api.c
index d471546b3e1..e132b8d1629 100644
--- a/tests/kernel/threads_customdata/cdata_api/src/test_customdata_api.c
+++ b/tests/kernel/threads_customdata/cdata_api/src/test_customdata_api.c
@@ -11,7 +11,7 @@
 #ifdef CONFIG_RISCV32
 #define STACK_SIZE 512
 #else
-#define STACK_SIZE 256
+#define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE)
 #endif
 
 /*local variables*/
diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c
index 79e809ff458..acdfe10b98d 100644
--- a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c
+++ b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c
@@ -12,7 +12,7 @@
  */
 #include <ztest.h>
 
-#define STACK_SIZE 256
+#define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE)
 static char __noinit __stack tstack[STACK_SIZE];
 static int execute_flag;
 
diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c
index 06eddef54c9..a16e2961f65 100644
--- a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c
+++ b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c
@@ -14,7 +14,7 @@
 
 #include <ztest.h>
 
-#define STACK_SIZE 256
+#define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE)
 static char __noinit __stack tstack[STACK_SIZE];
 
 static char tp1[8];
diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c
index 84cccdd63ec..8c49592caca 100644
--- a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c
+++ b/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c
@@ -12,7 +12,7 @@
  */
 #include <ztest.h>
 
-#define STACK_SIZE 256
+#define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE)
 static char __noinit __stack tstack[STACK_SIZE];
 static int last_prio;
 
diff --git a/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h b/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h
index 0537089e5f3..0f62136e8c8 100644
--- a/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h
+++ b/tests/kernel/threads_scheduling/schedule_api/src/test_sched.h
@@ -13,7 +13,7 @@
 #if defined(CONFIG_RISCV32)
 #define STACK_SIZE 512
 #else
-#define STACK_SIZE 256
+#define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE)
 #endif
 
 struct thread_data {
diff --git a/tests/legacy/kernel/test_context/src/context.c b/tests/legacy/kernel/test_context/src/context.c
index 9ebb8a42163..d68b5fa286b 100644
--- a/tests/legacy/kernel/test_context/src/context.c
+++ b/tests/legacy/kernel/test_context/src/context.c
@@ -31,7 +31,7 @@
   #include <board.h>
 #endif
 
-#define FIBER_STACKSIZE    384
+#define FIBER_STACKSIZE    (384 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define FIBER_PRIORITY     4
 
 #define THREAD_SELF_CMD    0
diff --git a/tests/legacy/kernel/test_sema/nanokernel/src/sema.c b/tests/legacy/kernel/test_sema/nanokernel/src/sema.c
index be14b275682..57006ecc8a6 100644
--- a/tests/legacy/kernel/test_sema/nanokernel/src/sema.c
+++ b/tests/legacy/kernel/test_sema/nanokernel/src/sema.c
@@ -37,9 +37,9 @@
 #include <util_test_common.h>
 
 #if defined(CONFIG_ASSERT) && defined(CONFIG_DEBUG)
-#define FIBER_STACKSIZE    512
+#define FIBER_STACKSIZE	(512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #else
-#define FIBER_STACKSIZE    384
+#define FIBER_STACKSIZE	(384 + CONFIG_TEST_EXTRA_STACKSIZE)
 #endif
 
 #define FIBER_PRIORITY     4
diff --git a/tests/legacy/kernel/test_sleep/src/sleep.c b/tests/legacy/kernel/test_sleep/src/sleep.c
index aff03aa0d61..f6e581d5369 100644
--- a/tests/legacy/kernel/test_sleep/src/sleep.c
+++ b/tests/legacy/kernel/test_sleep/src/sleep.c
@@ -25,9 +25,9 @@
 #include <util_test_common.h>
 
 #if defined(CONFIG_ASSERT) && defined(CONFIG_DEBUG)
-#define FIBER_STACKSIZE    384
+#define FIBER_STACKSIZE    (384 + CONFIG_TEST_EXTRA_STACKSIZE)
 #else
-#define FIBER_STACKSIZE    256
+#define FIBER_STACKSIZE    (256 + CONFIG_TEST_EXTRA_STACKSIZE)
 #endif
 
 #define TEST_FIBER_PRIORITY       4