diff --git a/src/arch/host/Kconfig b/src/arch/host/Kconfig
deleted file mode 100644
index de92f43a868c..000000000000
--- a/src/arch/host/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-
-# Host architecture configs
-
-config CORE_COUNT
-	int
-	default 1
-	help
-	  Number of used cores
diff --git a/src/platform/Kconfig b/src/platform/Kconfig
index ebbe0540b7d4..a8e0addc3b98 100644
--- a/src/platform/Kconfig
+++ b/src/platform/Kconfig
@@ -332,21 +332,30 @@ config MT8196
 
 endchoice
 
-config MAX_CORE_COUNT
+#
+# For non-Zephyr builds like testbench, cmocka and SOF ALSA plugin,
+# set core count separately.
+#
+if !ZEPHYR_SOF_MODULE
+
+config MP_MAX_NUM_CPUS
 	int
-	default 5 if LUNARLAKE || PANTHERLAKE
-	default 4 if TIGERLAKE || NOVALAKE
-	default 3 if METEORLAKE
-	default 3 if WILDCATLAKE
 	default 1
 	help
 	  Maximum number of cores per configuration
 
+endif # !ZEPHYR_SOF_MODULE
+
+config MAX_CORE_COUNT
+	int
+	default MP_MAX_NUM_CPUS
+	help
+	  Maximum number of cores per configuration
+
 config CORE_COUNT
 	int "Number of cores"
-	default MP_MAX_NUM_CPUS if KERNEL_BIN_NAME = "zephyr"
-	default MAX_CORE_COUNT
-	range 1 MAX_CORE_COUNT
+	default MP_MAX_NUM_CPUS
+	range 1 MP_MAX_NUM_CPUS
 	help
 	  Number of used cores
 	  Lowering available core count could result in lower power consumption