diff --git a/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig
index 4a945a4c03630..c8c10fe6ab828 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/sensors/defconfig
@@ -65,5 +65,5 @@ CONFIG_STM32_USART2_1WIREDRIVER=y
 CONFIG_STM32_USART_SINGLEWIRE=y
 CONFIG_STM32_USB=y
 CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_SENSORTEST=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_TESTING_SENSORTEST=y
diff --git a/boards/risc-v/esp32c3/esp32c3-generic/configs/temperature_sensor/defconfig b/boards/risc-v/esp32c3/esp32c3-generic/configs/temperature_sensor/defconfig
index 1ead6c42002d0..8550602be83bd 100644
--- a/boards/risc-v/esp32c3/esp32c3-generic/configs/temperature_sensor/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-generic/configs/temperature_sensor/defconfig
@@ -42,8 +42,8 @@ CONFIG_START_DAY=29
 CONFIG_START_MONTH=11
 CONFIG_START_YEAR=2019
 CONFIG_SYSTEM_DUMPSTACK=y
+CONFIG_SYSTEM_SENSORTEST=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
-CONFIG_TESTING_SENSORTEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/temperature_sensor/defconfig b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/temperature_sensor/defconfig
index bbee27aacfe0a..a84901591f250 100644
--- a/boards/risc-v/esp32c6/esp32c6-devkitc/configs/temperature_sensor/defconfig
+++ b/boards/risc-v/esp32c6/esp32c6-devkitc/configs/temperature_sensor/defconfig
@@ -44,8 +44,8 @@ CONFIG_START_DAY=29
 CONFIG_START_MONTH=11
 CONFIG_START_YEAR=2019
 CONFIG_SYSTEM_DUMPSTACK=y
+CONFIG_SYSTEM_SENSORTEST=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
-CONFIG_TESTING_SENSORTEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/risc-v/esp32h2/esp32h2-devkit/configs/temperature_sensor/defconfig b/boards/risc-v/esp32h2/esp32h2-devkit/configs/temperature_sensor/defconfig
index 6535c062be4ac..af870e29c6634 100644
--- a/boards/risc-v/esp32h2/esp32h2-devkit/configs/temperature_sensor/defconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/configs/temperature_sensor/defconfig
@@ -43,8 +43,8 @@ CONFIG_START_DAY=29
 CONFIG_START_MONTH=11
 CONFIG_START_YEAR=2019
 CONFIG_SYSTEM_DUMPSTACK=y
+CONFIG_SYSTEM_SENSORTEST=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
-CONFIG_TESTING_SENSORTEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/sim/sim/sim/configs/rc/defconfig b/boards/sim/sim/sim/configs/rc/defconfig
index a787e0eb874fa..c33e21e4e2fa0 100644
--- a/boards/sim/sim/sim/configs/rc/defconfig
+++ b/boards/sim/sim/sim/configs/rc/defconfig
@@ -40,5 +40,5 @@ CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2008
+CONFIG_SYSTEM_IRTEST=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_IRTEST=y
diff --git a/boards/sim/sim/sim/configs/sensor/defconfig b/boards/sim/sim/sim/configs/sensor/defconfig
index 67348f6f81731..dffbb64fb8474 100644
--- a/boards/sim/sim/sim/configs/sensor/defconfig
+++ b/boards/sim/sim/sim/configs/sensor/defconfig
@@ -46,4 +46,4 @@ CONFIG_SIM_WTGAHRS2_UARTN=0
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2008
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_SENSORTEST=y
+CONFIG_SYSTEM_SENSORTEST=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/bmp280/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/bmp280/defconfig
index 56baa0586e2af..e9dcac6ff8714 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/bmp280/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/bmp280/defconfig
@@ -59,5 +59,5 @@ CONFIG_SYSLOG_DEFAULT=y
 CONFIG_SYSLOG_MAX_CHANNELS=2
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_SENSORTEST=y
+CONFIG_SYSTEM_SENSORTEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig
index 822ddf63e9a90..9e8324d1006b3 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/ms5611/defconfig
@@ -55,6 +55,6 @@ CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_SENSORTEST=y
-CONFIG_TESTING_SENSORTEST_PROGNAME="sensor"
+CONFIG_SYSTEM_SENSORTEST=y
+CONFIG_SYSTEM_SENSORTEST_PROGNAME="sensor"
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/temperature_sensor/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/temperature_sensor/defconfig
index ee77bd9be7e5f..b3f5fdfec2424 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/temperature_sensor/defconfig
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/temperature_sensor/defconfig
@@ -45,5 +45,5 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_SENSORTEST=y
+CONFIG_SYSTEM_SENSORTEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/temperature_sensor/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/temperature_sensor/defconfig
index 916e9d5a2270f..ec634c9efff67 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/temperature_sensor/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/temperature_sensor/defconfig
@@ -48,5 +48,5 @@ CONFIG_START_MONTH=12
 CONFIG_START_YEAR=2011
 CONFIG_SYSLOG_BUFFER=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_TESTING_SENSORTEST=y
+CONFIG_SYSTEM_SENSORTEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y