diff --git a/arch/Kconfig b/arch/Kconfig
index 8e3c340aaa..89aeaccc55 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -107,7 +107,6 @@ config ARCH_XTENSA
 	select ARCH_HAVE_INTERRUPTSTACK
 	select ARCH_HAVE_STACKCHECK
 	select ARCH_HAVE_CUSTOMOPT
-	select ARCH_HAVE_TESTSET
 	select ARCH_HAVE_STDARG_H
 	select ARCH_HAVE_SETJMP if ARCH_TOOLCHAIN_GNU
 	select ARCH_HAVE_SYSCALL_HOOKS
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 0b16b9c279..be9077ae94 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -18,6 +18,7 @@ config ARCH_CHIP_ESP32
 	select ARCH_HAVE_SDRAM
 	select ARCH_HAVE_RESET
 	select ARCH_HAVE_BOOTLOADER
+	select ARCH_HAVE_TESTSET
 	select ARCH_VECNOTIRQ
 	select LIBC_ARCH_MEMCPY
 	select LIBC_ARCH_MEMCHR
@@ -51,6 +52,7 @@ config ARCH_CHIP_ESP32S2
 	select ARCH_HAVE_SDRAM
 	select ARCH_HAVE_RESET
 	select ARCH_HAVE_BOOTLOADER
+	select ARCH_HAVE_TESTSET
 	select ARCH_VECNOTIRQ
 	select LIBC_ARCH_MEMCPY
 	select LIBC_ARCH_MEMCHR
@@ -79,6 +81,7 @@ config ARCH_CHIP_ESP32S3
 	select ARCH_HAVE_SDRAM
 	select ARCH_HAVE_RESET
 	select ARCH_HAVE_BOOTLOADER
+	select ARCH_HAVE_TESTSET
 	select ARCH_VECNOTIRQ
 	select LIBC_ARCH_MEMCPY
 	select LIBC_ARCH_MEMCHR