diff --git a/samples/subsys/tracing/sample.yaml b/samples/subsys/tracing/sample.yaml
index ad1a38ef647b4..4f5f1951cd8f7 100644
--- a/samples/subsys/tracing/sample.yaml
+++ b/samples/subsys/tracing/sample.yaml
@@ -14,7 +14,6 @@ tests:
     extra_configs:
       - CONFIG_MP_NUM_CPUS=1
       - CONFIG_DEBUG_THREAD_INFO=y
-      - CONFIG_SMP=n
     arch_exclude: posix xtensa
     platform_exclude: qemu_x86_64
   tracing.transport.uart:
diff --git a/tests/kernel/threads/thread_init/prj.conf b/tests/kernel/threads/thread_init/prj.conf
index 390173dc4a59e..b1f5f03f8a120 100644
--- a/tests/kernel/threads/thread_init/prj.conf
+++ b/tests/kernel/threads/thread_init/prj.conf
@@ -1,3 +1,3 @@
 CONFIG_ZTEST=y
 CONFIG_TEST_USERSPACE=y
-CONFIG_SMP=n
+CONFIG_MP_NUM_CPUS=1
diff --git a/tests/net/socket/tls/prj.conf b/tests/net/socket/tls/prj.conf
index 45d43ab7342d8..25e38927779cb 100644
--- a/tests/net/socket/tls/prj.conf
+++ b/tests/net/socket/tls/prj.conf
@@ -1,5 +1,5 @@
 # Setup for self-contained net testing without requiring a SLIP driver
-CONFIG_SMP=n
+CONFIG_MP_NUM_CPUS=1
 CONFIG_NET_TEST=y
 
 # General config
diff --git a/tests/net/socket/tls_ext/prj.conf b/tests/net/socket/tls_ext/prj.conf
index 9cf33523521fb..8f01f6d590bc5 100644
--- a/tests/net/socket/tls_ext/prj.conf
+++ b/tests/net/socket/tls_ext/prj.conf
@@ -1,5 +1,5 @@
 # General config
-CONFIG_SMP=n
+CONFIG_MP_NUM_CPUS=1
 CONFIG_ZTEST=y
 
 # Networking config
diff --git a/tests/posix/common/prj.conf b/tests/posix/common/prj.conf
index f01ae5140a961..f59666309488d 100644
--- a/tests/posix/common/prj.conf
+++ b/tests/posix/common/prj.conf
@@ -8,4 +8,4 @@ CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_MAX_THREAD_BYTES=4
 CONFIG_THREAD_NAME=y
 
-CONFIG_SMP=n
+CONFIG_MP_NUM_CPUS=1
diff --git a/tests/subsys/portability/cmsis_rtos_v1/prj.conf b/tests/subsys/portability/cmsis_rtos_v1/prj.conf
index 49d0bda8da7a2..5314b87d883ef 100644
--- a/tests/subsys/portability/cmsis_rtos_v1/prj.conf
+++ b/tests/subsys/portability/cmsis_rtos_v1/prj.conf
@@ -5,4 +5,4 @@ CONFIG_CMSIS_RTOS_V1=y
 CONFIG_MAX_THREAD_BYTES=4
 CONFIG_IRQ_OFFLOAD=y
 CONFIG_CMSIS_THREAD_MAX_STACK_SIZE=2048
-CONFIG_SMP=n
+CONFIG_MP_NUM_CPUS=1