diff --git a/scripts/west_commands/runners/mdb.py b/scripts/west_commands/runners/mdb.py
index 3a7410969af..656d41618a6 100644
--- a/scripts/west_commands/runners/mdb.py
+++ b/scripts/west_commands/runners/mdb.py
@@ -72,7 +72,7 @@ def mdb_do_run(mdb_runner, command):
     if mdb_runner.cores == 1:
         # single core's mdb command is different with multicores
         mdb_cmd = [commander] + mdb_basic_options + mdb_target + mdb_run + [mdb_runner.elf_name]
-    elif 1 < mdb_runner.cores <= 4:
+    elif 1 < mdb_runner.cores <= 12:
         mdb_multifiles = '-multifiles='
         for i in range(mdb_runner.cores):
             mdb_sub_cmd = [commander] + ['-pset={}'.format(i + 1), '-psetname=core{}'.format(i)]
diff --git a/scripts/west_commands/tests/test_mdb.py b/scripts/west_commands/tests/test_mdb.py
index a6690f4ac5a..ca07b5d1640 100644
--- a/scripts/west_commands/tests/test_mdb.py
+++ b/scripts/west_commands/tests/test_mdb.py
@@ -92,8 +92,8 @@ TEST_HW_FLASH_CASES_ERR = [
         'i': ['--jtag=test_debug', '--cores=1'],
         'e': "unsupported jtag adapter test_debug"
     },{
-        'i': ['--jtag=digilent', '--cores=16'],
-        'e': "unsupported cores 16"
+        'i': ['--jtag=digilent', '--cores=13'],
+        'e': "unsupported cores 13"
     }]
 
 TEST_HW_DEBUG_CASES = [
@@ -116,8 +116,8 @@ TEST_HW_DEBUG_CASES_ERR = [
         'i': ['--jtag=test_debug', '--cores=1'],
         'e': "unsupported jtag adapter test_debug"
     }, {
-        'i': ['--jtag=digilent', '--cores=16'],
-        'e': "unsupported cores 16"
+        'i': ['--jtag=digilent', '--cores=13'],
+        'e': "unsupported cores 13"
     }]
 
 TEST_HW_MULTICORE_CASES = [['--jtag=digilent', '--cores=2']]