diff --git a/boards/arm/eoss3/quickfeather/configs/nsh/defconfig b/boards/arm/eoss3/quickfeather/configs/nsh/defconfig
index 7065249c88..de8c03d29d 100644
--- a/boards/arm/eoss3/quickfeather/configs/nsh/defconfig
+++ b/boards/arm/eoss3/quickfeather/configs/nsh/defconfig
@@ -36,7 +36,7 @@ CONFIG_STACK_COLORATION=y
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TESTING_GETPRIME=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3
 CONFIG_TESTING_OSTEST_STACKSIZE=4096
diff --git a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig
index 3c5f85698d..3f68644930 100644
--- a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig
@@ -64,7 +64,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_POPEN=y
 CONFIG_TESTING_GETPRIME=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y
 CONFIG_UART1_SERIAL_CONSOLE=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig
index 38eb4d46bd..366fe61572 100644
--- a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig
@@ -129,7 +129,7 @@ CONFIG_SYSTEM_NSH_PRIORITY=50
 CONFIG_SYSTEM_NSH_STACKSIZE=2500
 CONFIG_SYSTEM_PING=y
 CONFIG_TASK_NAME_SIZE=12
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_UART0_BAUD=2000000
 CONFIG_UART0_RXBUFSIZE=128
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig
index 9e7f2c53cb..a45afdc86a 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest/defconfig
@@ -130,7 +130,7 @@ CONFIG_TESTING_FOPENCOOKIE_TEST=y
 CONFIG_TESTING_FSTEST=y
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_LTP=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OPEN_MEMSTREAM=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_TESTS_TESTSUITES=y
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig
index 4a61f056a2..7ea7db7d4d 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig
@@ -78,6 +78,6 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_POPEN=y
 CONFIG_SYSTEM_POPEN_STACKSIZE=3072
 CONFIG_TESTING_GETPRIME=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_USEC_PER_TICK=1000
diff --git a/boards/sim/sim/sim/configs/citest/defconfig b/boards/sim/sim/sim/configs/citest/defconfig
index fc68a5ddd3..de78694b53 100644
--- a/boards/sim/sim/sim/configs/citest/defconfig
+++ b/boards/sim/sim/sim/configs/citest/defconfig
@@ -142,7 +142,7 @@ CONFIG_TESTING_FSTEST=y
 CONFIG_TESTING_FSTEST_MOUNTPT="/tmp"
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_LTP=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OPEN_MEMSTREAM=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_TESTING_SCANFTEST=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
index fdcfc92b48..67da7c9bfe 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
@@ -55,6 +55,6 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_SMP=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig
index dbe27f7083..94df13d640 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig
@@ -58,7 +58,7 @@ CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TESTING_GETPRIME=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_TESTING_SMP=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_octal/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_octal/defconfig
index 5ccaac2836..03817d1bf5 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_octal/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_octal/defconfig
@@ -49,5 +49,5 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_quad/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_quad/defconfig
index b9b8a1baf9..b3c44da993 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_quad/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_quad/defconfig
@@ -48,5 +48,5 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_usrheap/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_usrheap/defconfig
index fc7a7611cf..75fb23a177 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_usrheap/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/psram_usrheap/defconfig
@@ -55,6 +55,6 @@ CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TESTING_GETPRIME=y
-CONFIG_TESTING_MM=y
+CONFIG_TESTING_HEAP=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y