diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 72907a41fee..7f4f57eb283 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -428,6 +428,7 @@ config MAIN_STACK_SIZE
 	default 2048 if PMP_STACK_GUARD
 
 config TEST_EXTRA_STACK_SIZE
+	default 4096 if CPP_EXCEPTIONS
 	default 1536
 
 config CMSIS_THREAD_MAX_STACK_SIZE