diff --git a/tests/kernel/spinlock/src/main.c b/tests/kernel/spinlock/src/main.c
index ba35979e756..1c64cc98a6e 100644
--- a/tests/kernel/spinlock/src/main.c
+++ b/tests/kernel/spinlock/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/spinlock.h>
 
-BUILD_ASSERT(CONFIG_MP_NUM_CPUS > 1);
+BUILD_ASSERT(CONFIG_MP_MAX_NUM_CPUS > 1);
 
 #define CPU1_STACK_SIZE 1024
 
diff --git a/tests/kernel/spinlock/src/spinlock_error_case.c b/tests/kernel/spinlock/src/spinlock_error_case.c
index ac2a48439f6..9b9d87e8c9b 100644
--- a/tests/kernel/spinlock/src/spinlock_error_case.c
+++ b/tests/kernel/spinlock/src/spinlock_error_case.c
@@ -8,7 +8,7 @@
 #include <zephyr/ztest.h>
 #include <zephyr/spinlock.h>
 
-BUILD_ASSERT(CONFIG_MP_NUM_CPUS > 1);
+BUILD_ASSERT(CONFIG_MP_MAX_NUM_CPUS > 1);
 
 static struct k_spinlock lock;
 static struct k_spinlock mylock;
diff --git a/tests/kernel/spinlock/testcase.yaml b/tests/kernel/spinlock/testcase.yaml
index ecc2eaa895c..8cbd762f029 100644
--- a/tests/kernel/spinlock/testcase.yaml
+++ b/tests/kernel/spinlock/testcase.yaml
@@ -1,4 +1,4 @@
 tests:
   kernel.multiprocessing.spinlock:
     tags: kernel smp spinlock
-    filter: CONFIG_SMP and CONFIG_MP_NUM_CPUS > 1 and CONFIG_MP_NUM_CPUS <= 4
+    filter: CONFIG_SMP and CONFIG_MP_MAX_NUM_CPUS > 1 and CONFIG_MP_MAX_NUM_CPUS <= 4