diff --git a/buildroot/bin/opt_enable b/buildroot/bin/opt_enable
index 96686d6c68..fdcb5dae2d 100755
--- a/buildroot/bin/opt_enable
+++ b/buildroot/bin/opt_enable
@@ -7,7 +7,7 @@ SED=$(which gsed || which sed)
 
 for opt in "$@" ; do
   # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
-  eval "${SED} -i '/\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
-  eval "${SED} -i '/\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
+  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
+  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
   (echo "ERROR: opt_enable Can't find ${opt}" >&2 && exit 9)
 done
diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set
index a646e09ae7..2a7a676cdc 100755
--- a/buildroot/bin/opt_set
+++ b/buildroot/bin/opt_set
@@ -5,8 +5,12 @@ set -e
 
 SED=$(which gsed || which sed)
 
-# Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
-eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
-eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
-eval "echo '#define ${@}' >>Marlin/Configuration_adv.h" ||
-(echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
+ARGC=$#
+while [[ $# > 1 ]]; do
+  # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
+  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
+  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
+  eval "echo '#define ${1} ${2}' >>Marlin/Configuration.h" ||
+  (echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
+  shift 2
+done
diff --git a/buildroot/bin/pins_set b/buildroot/bin/pins_set
index 87a8692aa2..860c64940f 100755
--- a/buildroot/bin/pins_set
+++ b/buildroot/bin/pins_set
@@ -7,5 +7,5 @@ PIN=$2
 VAL=$3
 
 SED=$(which gsed || which sed)
-eval "${SED} -i '/\(\/\/\)*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/$DIR/pins_${NAM}.h" ||
+eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/$DIR/pins_${NAM}.h" ||
 (echo "ERROR: pins_set Can't find ${PIN}" >&2 && exit 9)
diff --git a/buildroot/tests/ARMED-tests b/buildroot/tests/ARMED-tests
index 6aa1308ca4..8764d47e84 100755
--- a/buildroot/tests/ARMED-tests
+++ b/buildroot/tests/ARMED-tests
@@ -11,8 +11,7 @@ set -e
 #
 restore_configs
 use_example_configs ArmEd
-opt_set X_DRIVER_TYPE TMC2130
-opt_set Y_DRIVER_TYPE TMC2208
+opt_set X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2208
 exec_test $1 $2 "ArmEd Example Configuration with mixed TMC Drivers" "$3"
 
 # clean up
diff --git a/buildroot/tests/BIGTREE_BTT002-tests b/buildroot/tests/BIGTREE_BTT002-tests
index 90e033e969..ba13e3eafd 100755
--- a/buildroot/tests/BIGTREE_BTT002-tests
+++ b/buildroot/tests/BIGTREE_BTT002-tests
@@ -10,10 +10,10 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_BTT002_V1_0
-opt_set SERIAL_PORT 1
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2130
+opt_set MOTHERBOARD BOARD_BTT_BTT002_V1_0 \
+        SERIAL_PORT 1 \
+        X_DRIVER_TYPE TMC2209 \
+        Y_DRIVER_TYPE TMC2130
 exec_test $1 $2 "BigTreeTech BTT002 Default Configuration plus TMC steppers" "$3"
 
 # clean up
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0-tests b/buildroot/tests/BIGTREE_GTR_V1_0-tests
index adc850db03..95a1e0acac 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0-tests
+++ b/buildroot/tests/BIGTREE_GTR_V1_0-tests
@@ -7,54 +7,24 @@
 set -e
 
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
-opt_set SERIAL_PORT -1
-opt_set EXTRUDERS 8
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_2 1
-opt_set TEMP_SENSOR_3 1
-opt_set TEMP_SENSOR_4 1
-opt_set TEMP_SENSOR_5 1
-opt_set TEMP_SENSOR_6 1
-opt_set TEMP_SENSOR_7 1
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
+        EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
-opt_set E0_AUTO_FAN_PIN PC10
-opt_set E1_AUTO_FAN_PIN PC11
-opt_set E2_AUTO_FAN_PIN PC12
-opt_set X_DRIVER_TYPE TMC2208
-opt_set Y_DRIVER_TYPE TMC2130
-opt_set NEOPIXEL_PIN PF13
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING
-opt_enable FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
-opt_set FIL_RUNOUT_PIN 3
-opt_set FIL_RUNOUT2_PIN 4
-opt_set FIL_RUNOUT3_PIN 5
-opt_set FIL_RUNOUT4_PIN 6
-opt_set FIL_RUNOUT5_PIN 7
-opt_set FIL_RUNOUT6_PIN 8
-opt_set FIL_RUNOUT7_PIN 9
-opt_set FIL_RUNOUT8_PIN 10
-opt_set FIL_RUNOUT4_STATE HIGH
-opt_enable FIL_RUNOUT4_PULLUP
-opt_set FIL_RUNOUT8_STATE HIGH
-opt_enable FIL_RUNOUT8_PULLUP
-exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan, Mixed TMC Drivers, and Runout Sensors with distinct states" "$3"
+opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
+        X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130 \
+        FIL_RUNOUT_PIN 3 FIL_RUNOUT2_PIN 4 FIL_RUNOUT3_PIN 5 FIL_RUNOUT4_PIN 6 FIL_RUNOUT5_PIN 7 FIL_RUNOUT6_PIN 8 FIL_RUNOUT7_PIN 9 FIL_RUNOUT8_PIN 10 \
+        FIL_RUNOUT4_STATE HIGH FIL_RUNOUT8_STATE HIGH
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE \
+           FILAMENT_RUNOUT_SENSOR FIL_RUNOUT4_PULLUP FIL_RUNOUT8_PULLUP
+exec_test $1 $2 "BigTreeTech GTR | 8 Extruders | Auto-Fan | Mixed TMC Drivers | Runout Sensors w/ distinct states" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
-opt_set SERIAL_PORT -1
-opt_set EXTRUDERS 6
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_2 1
-opt_set TEMP_SENSOR_3 1
-opt_set TEMP_SENSOR_4 1
-opt_set TEMP_SENSOR_5 1
-opt_set NUM_Z_STEPPER_DRIVERS 3
-opt_set DEFAULT_Kp_LIST "{ 22.2, 20.0, 21.0, 19.0, 18.0, 17.0 }"
-opt_set DEFAULT_Ki_LIST "{ 1.08 }"
-opt_set DEFAULT_Kd_LIST "{ 114.0, 112.0, 110.0, 108.0 }"
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
+        EXTRUDERS 6 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 \
+        NUM_Z_STEPPER_DRIVERS 3 \
+        DEFAULT_Kp_LIST '{ 22.2, 20.0, 21.0, 19.0, 18.0, 17.0 }' DEFAULT_Ki_LIST '{ 1.08 }' DEFAULT_Kd_LIST '{ 114.0, 112.0, 110.0, 108.0 }'
 opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_INIT_BEFORE_SWAP TOOLCHANGE_FS_PRIME_FIRST_USED PID_PARAMS_PER_HOTEND
-exec_test $1 $2 "BigTreeTech GTR 6 Extruders Triple Z" "$3"
+exec_test $1 $2 "BigTreeTech GTR | 6 Extruders | Triple Z" "$3"
 
 # clean up
 restore_configs
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive-tests b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive-tests
index 0504fc1da9..197ece5dfd 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive-tests
+++ b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive-tests
@@ -7,41 +7,18 @@
 set -e
 
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
-opt_set SERIAL_PORT 3
-opt_set EXTRUDERS 8
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_2 1
-opt_set TEMP_SENSOR_3 1
-opt_set TEMP_SENSOR_4 1
-opt_set TEMP_SENSOR_5 1
-opt_set TEMP_SENSOR_6 1
-opt_set TEMP_SENSOR_7 1
-opt_set SDSUPPORT
-opt_set USB_FLASH_DRIVE_SUPPORT
-opt_set USE_OTG_USB_HOST
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
+        EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
+opt_enable SDSUPPORT USB_FLASH_DRIVE_SUPPORT USE_OTG_USB_HOST \
+           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING \
+           FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
-opt_set E0_AUTO_FAN_PIN PC10
-opt_set E1_AUTO_FAN_PIN PC11
-opt_set E2_AUTO_FAN_PIN PC12
-opt_set X_DRIVER_TYPE TMC2208
-opt_set Y_DRIVER_TYPE TMC2130
-opt_set NEOPIXEL_PIN PF13
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING
-opt_enable FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
-opt_set FIL_RUNOUT_PIN 3
-opt_set FIL_RUNOUT2_PIN 4
-opt_set FIL_RUNOUT3_PIN 5
-opt_set FIL_RUNOUT4_PIN 6
-opt_set FIL_RUNOUT5_PIN 7
-opt_set FIL_RUNOUT6_PIN 8
-opt_set FIL_RUNOUT7_PIN 9
-opt_set FIL_RUNOUT8_PIN 10
-opt_set FIL_RUNOUT4_STATE HIGH
-opt_enable FIL_RUNOUT4_PULLUP
-opt_set FIL_RUNOUT8_STATE HIGH
-opt_enable FIL_RUNOUT8_PULLUP
-exec_test $1 $2 "BigTreeTech GTR + OTG USB Flash Drive + Extruders with Auto-Fan, Mixed TMC Drivers, and Runout Sensors with distinct states" "$3"
+opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
+        X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130 \
+        FIL_RUNOUT_PIN 3 FIL_RUNOUT2_PIN 4 FIL_RUNOUT3_PIN 5 FIL_RUNOUT4_PIN 6 FIL_RUNOUT5_PIN 7 FIL_RUNOUT6_PIN 8 FIL_RUNOUT7_PIN 9 FIL_RUNOUT8_PIN 10 \
+        FIL_RUNOUT4_STATE HIGH FIL_RUNOUT8_STATE HIGH
+opt_enable FIL_RUNOUT4_PULLUP FIL_RUNOUT8_PULLUP
+exec_test $1 $2 "GTT GTR | OTG USB Flash Drive | 8 Extruders | Auto-Fan | Mixed TMC Drivers | Runout Sensors (distinct)" "$3"
 
 # clean up
 restore_configs
diff --git a/buildroot/tests/BIGTREE_SKR_PRO-tests b/buildroot/tests/BIGTREE_SKR_PRO-tests
index 8dc433deb2..74020c1b27 100755
--- a/buildroot/tests/BIGTREE_SKR_PRO-tests
+++ b/buildroot/tests/BIGTREE_SKR_PRO-tests
@@ -10,31 +10,22 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
-opt_set SERIAL_PORT 1
+opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT 1
 exec_test $1 $2 "BigTreeTech SKR Pro Default Configuration" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
-opt_set SERIAL_PORT -1
-opt_set EXTRUDERS 3
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_2 1
-opt_set E0_AUTO_FAN_PIN PC10
-opt_set E1_AUTO_FAN_PIN PC11
-opt_set E2_AUTO_FAN_PIN PC12
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2130
+opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT -1 \
+        EXTRUDERS 3 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 \
+        E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2130
 opt_enable BLTOUCH EEPROM_SETTINGS AUTO_BED_LEVELING_3POINT Z_SAFE_HOMING PINS_DEBUGGING
 exec_test $1 $2 "BigTreeTech SKR Pro 3 Extruders, Auto-Fan, BLTOUCH, mixed TMC drivers" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1
-opt_set SERIAL_PORT -1
+opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT -1 \
+        CUTTER_POWER_UNIT PERCENT \
+        SPINDLE_LASER_PWM_PIN HEATER_1_PIN SPINDLE_LASER_ENA_PIN HEATER_2_PIN
 opt_enable LASER_FEATURE REPRAP_DISCOUNT_SMART_CONTROLLER
-opt_set CUTTER_POWER_UNIT PERCENT
-opt_add SPINDLE_LASER_PWM_PIN HEATER_1_PIN
-opt_add SPINDLE_LASER_ENA_PIN HEATER_2_PIN
 exec_test $1 $2 "Laser, LCD, PERCENT power unit" "$3"
 
 # clean up
diff --git a/buildroot/tests/DUE-tests b/buildroot/tests/DUE-tests
index 1e22ba3370..d1601edf5a 100755
--- a/buildroot/tests/DUE-tests
+++ b/buildroot/tests/DUE-tests
@@ -7,12 +7,12 @@
 set -e
 
 restore_configs
-opt_set LCD_LANGUAGE bg
-opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB
-opt_set TEMP_SENSOR_0 -2
-opt_set TEMP_SENSOR_BED 2
-opt_set GRID_MAX_POINTS_X 16
-opt_set FANMUX0_PIN 53
+opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB \
+        LCD_LANGUAGE bg \
+        TEMP_SENSOR_0 -2 TEMP_SENSOR_BED 2 \
+        GRID_MAX_POINTS_X 16 \
+        E0_AUTO_FAN_PIN 8 FANMUX0_PIN 53 EXTRUDER_AUTO_FAN_SPEED 100 \
+        TEMP_SENSOR_CHAMBER 3 TEMP_CHAMBER_PIN 6 HEATER_CHAMBER_PIN 45
 opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
            ASSISTED_TRAMMING ASSISTED_TRAMMING_WIZARD REPORT_TRAMMING_MM ASSISTED_TRAMMING_WAIT_POSITION \
@@ -28,23 +28,17 @@ opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
            PIDTEMPBED SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER \
            PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL \
            EXTENSIBLE_UI
-opt_add    EXTUI_EXAMPLE
-opt_set E0_AUTO_FAN_PIN 8
-opt_set EXTRUDER_AUTO_FAN_SPEED 100
-opt_set TEMP_SENSOR_CHAMBER 3
-opt_add TEMP_CHAMBER_PIN 6
-opt_set HEATER_CHAMBER_PIN 45
+opt_add EXTUI_EXAMPLE
 exec_test $1 $2 "RAMPS4DUE_EFB with ABL (Bilinear), ExtUI, S-Curve, many options." "$3"
 
 #
 # RADDS with BLTouch, ABL(B), 3 x Z auto-align
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RADDS
+opt_set MOTHERBOARD BOARD_RADDS NUM_Z_STEPPER_DRIVERS 3
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
            Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS Z_SAFE_HOMING
            #TOUCH_UI_FTDI_EVE LCD_ALEPHOBJECTS_CLCD_UI OTHER_PIN_LAYOUT
-opt_set NUM_Z_STEPPER_DRIVERS 3
 pins_set ramps/RAMPS X_MAX_PIN -1
 pins_set ramps/RAMPS Y_MAX_PIN -1
 exec_test $1 $2 "RADDS with ABL (Bilinear), Triple Z Axis, Z_STEPPER_AUTO_ALIGN" "$3"
@@ -53,9 +47,6 @@ exec_test $1 $2 "RADDS with ABL (Bilinear), Triple Z Axis, Z_STEPPER_AUTO_ALIGN"
 # Test SWITCHING_EXTRUDER
 #
 restore_configs
-opt_set LCD_LANGUAGE fi
-opt_set MOTHERBOARD BOARD_RAMPS4DUE_EEF
-opt_set EXTRUDERS 2
-opt_set NUM_SERVOS 1
+opt_set MOTHERBOARD BOARD_RAMPS4DUE_EEF LCD_LANGUAGE fi EXTRUDERS 2 NUM_SERVOS 1
 opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER BEEP_ON_FEEDRATE_CHANGE POWER_LOSS_RECOVERY
 exec_test $1 $2 "RAMPS4DUE_EEF with SWITCHING_EXTRUDER, POWER_LOSS_RECOVERY" "$3"
diff --git a/buildroot/tests/FLYF407ZG-tests b/buildroot/tests/FLYF407ZG-tests
index 2c915eb48b..22dd3488c8 100755
--- a/buildroot/tests/FLYF407ZG-tests
+++ b/buildroot/tests/FLYF407ZG-tests
@@ -8,10 +8,7 @@ set -e
 
 # Build examples
 restore_configs
-opt_set MOTHERBOARD BOARD_FLYF407ZG
-opt_set SERIAL_PORT -1
-opt_set X_DRIVER_TYPE TMC2208
-opt_set Y_DRIVER_TYPE TMC2130
+opt_set MOTHERBOARD BOARD_FLYF407ZG SERIAL_PORT -1 X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130
 exec_test $1 $2 "FLYF407ZG Default Config with mixed TMC Drivers" "$3"
 
 # cleanup
diff --git a/buildroot/tests/FYSETC_F6-tests b/buildroot/tests/FYSETC_F6-tests
index e1eb6684a5..3fe59d59a1 100755
--- a/buildroot/tests/FYSETC_F6-tests
+++ b/buildroot/tests/FYSETC_F6-tests
@@ -18,34 +18,24 @@ exec_test $1 $2 "FYSETC F6 1.3 with DGUS" "$3"
 # Delta Config (generic) + UBL + ALLEN_KEY + EEPROM_SETTINGS + OLED_PANEL_TINYBOY2
 #
 use_example_configs delta/generic
-opt_set MOTHERBOARD BOARD_FYSETC_F6_13
+opt_set MOTHERBOARD BOARD_FYSETC_F6_13 \
+        LCD_LANGUAGE ko_KR \
+        X_DRIVER_TYPE L6470 Y_DRIVER_TYPE L6470 Z_DRIVER_TYPE L6470 \
+        L6470_CHAIN_SCK_PIN 53 L6470_CHAIN_MISO_PIN 49 L6470_CHAIN_MOSI_PIN 40 L6470_CHAIN_SS_PIN 42 \
+        'ENABLE_RESET_L64XX_CHIPS(V)' NOOP
 opt_enable RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS EEPROM_CHITCHAT \
            Z_PROBE_ALLEN_KEY AUTO_BED_LEVELING_UBL \
            OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY DELTA_CALIBRATION_MENU
-opt_set LCD_LANGUAGE ko_KR
-opt_set X_DRIVER_TYPE L6470
-opt_set Y_DRIVER_TYPE L6470
-opt_set Z_DRIVER_TYPE L6470
-opt_add L6470_CHAIN_SCK_PIN  53
-opt_add L6470_CHAIN_MISO_PIN 49
-opt_add L6470_CHAIN_MOSI_PIN 40
-opt_add L6470_CHAIN_SS_PIN   42
-opt_add "ENABLE_RESET_L64XX_CHIPS(V) NOOP"
 exec_test $1 $2 "DELTA, RAMPS, L6470, UBL, Allen Key, EEPROM, OLED_PANEL_TINYBOY2..." "$3"
 
 #
 # Test mixed TMC config
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_FYSETC_F6_13
-opt_set LCD_LANGUAGE vi
-opt_set LCD_LANGUAGE_2 fr
-opt_set X_DRIVER_TYPE TMC2160
-opt_set Y_DRIVER_TYPE TMC5160
-opt_set Z_DRIVER_TYPE TMC2208_STANDALONE
-opt_set E0_DRIVER_TYPE TMC2130
-opt_set X_MIN_ENDSTOP_INVERTING true
-opt_set Y_MIN_ENDSTOP_INVERTING true
+opt_set MOTHERBOARD BOARD_FYSETC_F6_13 \
+        LCD_LANGUAGE vi LCD_LANGUAGE_2 fr \
+        X_DRIVER_TYPE TMC2160 Y_DRIVER_TYPE TMC5160 Z_DRIVER_TYPE TMC2208_STANDALONE E0_DRIVER_TYPE TMC2130 \
+        X_MIN_ENDSTOP_INVERTING true Y_MIN_ENDSTOP_INVERTING true
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
            MARLIN_BRICKOUT MARLIN_INVADERS MARLIN_SNAKE \
            MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD \
@@ -63,17 +53,14 @@ exec_test $1 $2 "RAMPS 1.3 | DELTA | FLSUN AC Config" "$3"
 # SCARA with Mixed TMC
 #
 use_example_configs SCARA/Morgan
-opt_set MOTHERBOARD BOARD_FYSETC_F6_13
-opt_set LCD_LANGUAGE es
+opt_set MOTHERBOARD BOARD_FYSETC_F6_13 \
+        LCD_LANGUAGE es \
+        X_MAX_ENDSTOP_INVERTING false \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2130 Z_DRIVER_TYPE TMC2130_STANDALONE E0_DRIVER_TYPE TMC2660 \
+        X_HARDWARE_SERIAL Serial2
 opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
            FYSETC_242_OLED_12864 EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
            STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
-opt_set X_MAX_ENDSTOP_INVERTING false
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2130
-opt_set Z_DRIVER_TYPE TMC2130_STANDALONE
-opt_set E0_DRIVER_TYPE TMC2660
-opt_add X_HARDWARE_SERIAL Serial2
 exec_test $1 $2 "FYSETC_F6 | SCARA | Mixed TMC | EEPROM" "$3"
 
 # clean up
diff --git a/buildroot/tests/FYSETC_S6-tests b/buildroot/tests/FYSETC_S6-tests
index c7f7a16bbd..ce5442c376 100755
--- a/buildroot/tests/FYSETC_S6-tests
+++ b/buildroot/tests/FYSETC_S6-tests
@@ -10,8 +10,7 @@ set -e
 restore_configs
 use_example_configs FYSETC/S6
 opt_enable MEATPACK
-opt_set Y_DRIVER_TYPE TMC2209
-opt_set Z_DRIVER_TYPE TMC2130
+opt_set Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130
 exec_test $1 $2 "FYSETC S6 Example" "$3"
 
 # cleanup
diff --git a/buildroot/tests/LERDGEX-tests b/buildroot/tests/LERDGEX-tests
index 7fcdb2684f..cf7dfebfea 100755
--- a/buildroot/tests/LERDGEX-tests
+++ b/buildroot/tests/LERDGEX-tests
@@ -10,8 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_LERDGE_X
-opt_set SERIAL_PORT 1
+opt_set MOTHERBOARD BOARD_LERDGE_X SERIAL_PORT 1
 exec_test $1 $2 "LERDGE X with Default Configuration" "$3"
 
 # clean up
diff --git a/buildroot/tests/LPC1768-tests b/buildroot/tests/LPC1768-tests
index 27d2fbf3ff..a6829e85ea 100755
--- a/buildroot/tests/LPC1768-tests
+++ b/buildroot/tests/LPC1768-tests
@@ -14,9 +14,8 @@ set -e
 #exec_test $1 $2 "Default Configuration" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
+opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB NEOPIXEL_PIN P1_16
 opt_enable VIKI2 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 NEOPIXEL_LED
-opt_set NEOPIXEL_PIN P1_16
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"
 
 #restore_configs
@@ -24,19 +23,18 @@ exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), N
 #exec_test $1 $2 "MKS SBASE Example Config" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_MKS_SBASE
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
-opt_set NUM_SERVOS 2
-opt_set SERVO_DELAY "{ 300, 300 }"
+opt_set MOTHERBOARD BOARD_MKS_SBASE \
+        EXTRUDERS 2 TEMP_SENSOR_1 1 \
+        NUM_SERVOS 2 SERVO_DELAY '{ 300, 300 }'
 opt_enable SWITCHING_NOZZLE SWITCHING_NOZZLE_E1_SERVO_NR ULTIMAKERCONTROLLER
 exec_test $1 $2 "MKS SBASE with SWITCHING_NOZZLE" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EEB
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 -1
-opt_set TEMP_SENSOR_BED 5
+opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EEB \
+        EXTRUDERS 2 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 \
+        GRID_MAX_POINTS_X 16 \
+        NOZZLE_TO_PROBE_OFFSET '{ 0, 0, 0 }' \
+        NOZZLE_CLEAN_MIN_TEMP 170
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY PID_EXTRUSION_SCALING SOUND_MENU_ITEM \
            NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR PREHEAT_BEFORE_LEVELING G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
@@ -46,9 +44,6 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ADAPTIVE_FAN_SLOWING NO
            HOST_KEEPALIVE_FEATURE HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT \
            LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES \
            SDSUPPORT SDCARD_SORT_ALPHA AUTO_REPORT_SD_STATUS EMERGENCY_PARSER
-opt_set GRID_MAX_POINTS_X 16
-opt_set NOZZLE_TO_PROBE_OFFSET "{ 0, 0, 0 }"
-opt_set NOZZLE_CLEAN_MIN_TEMP 170
 exec_test $1 $2 "Re-ARM with NOZZLE_AS_PROBE and many features." "$3"
 
 # clean up
diff --git a/buildroot/tests/LPC1769-tests b/buildroot/tests/LPC1769-tests
index 0a61d42800..5ca7114543 100755
--- a/buildroot/tests/LPC1769-tests
+++ b/buildroot/tests/LPC1769-tests
@@ -13,17 +13,15 @@ use_example_configs Azteeg/X5GT
 exec_test $1 $2 "Azteeg X5GT Example Configuration" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_SMOOTHIEBOARD
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 -1
-opt_set TEMP_SENSOR_BED 5
+opt_set MOTHERBOARD BOARD_SMOOTHIEBOARD \
+        EXTRUDERS 2 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 \
+        GRID_MAX_POINTS_X 16
 opt_enable TFTGLCD_PANEL_SPI SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET LEVEL_CORNERS_USE_PROBE LEVEL_CORNERS_VERIFY_RAISED \
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
            Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
            LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA EMERGENCY_PARSER
-opt_set GRID_MAX_POINTS_X 16
 exec_test $1 $2 "Smoothieboard with TFTGLCD_PANEL_SPI and many features" "$3"
 
 #restore_configs
@@ -36,17 +34,13 @@ exec_test $1 $2 "Smoothieboard with TFTGLCD_PANEL_SPI and many features" "$3"
 #           SD_ABORT_ON_ENDSTOP_HIT ADVANCED_OK GCODE_MACROS \
 #           VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS \
 #           EXTRA_FAN_SPEED FWRETRACT MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
-#opt_set FAN_MIN_PWM 50
-#opt_set FAN_KICKSTART_TIME 100
-#opt_set XY_FREQUENCY_LIMIT  15
+#opt_set FAN_MIN_PWM 50 FAN_KICKSTART_TIME 100 XY_FREQUENCY_LIMIT  15
 #exec_test $1 $2 "Azteeg X5 MINI WIFI Many less common options" "$3"
 
 restore_configs
 use_example_configs delta/generic
-opt_set MOTHERBOARD BOARD_COHESION3D_REMIX
-opt_set X_DRIVER_TYPE TMC2130
-opt_set Y_DRIVER_TYPE TMC2130
-opt_set Z_DRIVER_TYPE TMC2130
+opt_set MOTHERBOARD BOARD_COHESION3D_REMIX \
+        X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2130 Z_DRIVER_TYPE TMC2130
 opt_enable AUTO_BED_LEVELING_BILINEAR EEPROM_SETTINGS EEPROM_CHITCHAT MECHANICAL_GANTRY_CALIBRATION \
            TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z HYBRID_THRESHOLD \
            SENSORLESS_PROBING Z_SAFE_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY TMC_DEBUG \
diff --git a/buildroot/tests/NUCLEO_F767ZI-tests b/buildroot/tests/NUCLEO_F767ZI-tests
index bd5ca86970..9e23246606 100755
--- a/buildroot/tests/NUCLEO_F767ZI-tests
+++ b/buildroot/tests/NUCLEO_F767ZI-tests
@@ -10,11 +10,8 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_NUCLEO_F767ZI
-opt_set SERIAL_PORT -1
+opt_set MOTHERBOARD BOARD_NUCLEO_F767ZI SERIAL_PORT -1 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2208
 opt_enable BLTOUCH Z_SAFE_HOMING SPEAKER SOFTWARE_DRIVER_ENABLE
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2208
 exec_test $1 $2 "Mixed timer usage" "$3"
 
 # clean up
diff --git a/buildroot/tests/SAMD51_grandcentral_m4-tests b/buildroot/tests/SAMD51_grandcentral_m4-tests
index a98929520e..92a62c9d37 100755
--- a/buildroot/tests/SAMD51_grandcentral_m4-tests
+++ b/buildroot/tests/SAMD51_grandcentral_m4-tests
@@ -10,20 +10,14 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set SERIAL_PORT -1
-opt_set MOTHERBOARD BOARD_AGCM4_RAMPS_144
-opt_set TEMP_SENSOR_0 11
-opt_set TEMP_SENSOR_BED 11
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2209
-opt_set Z_DRIVER_TYPE TMC2209
-opt_set Z2_DRIVER_TYPE TMC2209
-opt_set E0_DRIVER_TYPE TMC2209
-opt_set RESTORE_LEVELING_AFTER_G28 false
-opt_set LCD_LANGUAGE it
-opt_set NUM_Z_STEPPER_DRIVERS 2
-opt_set HOMING_BUMP_MM "{ 0, 0, 0 }"
-opt_set SDCARD_CONNECTION LCD
+opt_set MOTHERBOARD BOARD_AGCM4_RAMPS_144 SERIAL_PORT -1 \
+        TEMP_SENSOR_0 11 TEMP_SENSOR_BED 11 \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 Z2_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209 \
+        RESTORE_LEVELING_AFTER_G28 false \
+        LCD_LANGUAGE it \
+        SDCARD_CONNECTION LCD \
+        NUM_Z_STEPPER_DRIVERS 2 \
+        HOMING_BUMP_MM '{ 0, 0, 0 }'
 opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_REPEATABILITY_TEST \
            FILAMENT_RUNOUT_SENSOR G26_MESH_VALIDATION MESH_EDIT_GFX_OVERLAY Z_SAFE_HOMING \
            EEPROM_SETTINGS NOZZLE_PARK_FEATURE SDSUPPORT SD_CHECK_AND_RETRY \
diff --git a/buildroot/tests/STM32F070CB_malyan-tests b/buildroot/tests/STM32F070CB_malyan-tests
index eeec7e9b1f..060d707b04 100755
--- a/buildroot/tests/STM32F070CB_malyan-tests
+++ b/buildroot/tests/STM32F070CB_malyan-tests
@@ -7,8 +7,7 @@
 set -e
 
 restore_configs
-opt_set MOTHERBOARD BOARD_MALYAN_M200_V2
-opt_set SERIAL_PORT -1
+opt_set MOTHERBOARD BOARD_MALYAN_M200_V2 SERIAL_PORT -1
 exec_test $1 $2 "Malyan M200 v2 Default Config" "$3"
 
 # cleanup
diff --git a/buildroot/tests/STM32F103RC_btt-tests b/buildroot/tests/STM32F103RC_btt-tests
index f500b76315..e76060aee8 100755
--- a/buildroot/tests/STM32F103RC_btt-tests
+++ b/buildroot/tests/STM32F103RC_btt-tests
@@ -10,13 +10,8 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0
-opt_set SERIAL_PORT 1
-opt_set SERIAL_PORT_2 -1
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2209
-opt_set Z_DRIVER_TYPE TMC2209
-opt_set E0_DRIVER_TYPE TMC2209
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209
 opt_enable PINS_DEBUGGING Z_IDLE_HEIGHT
 
 exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - Basic Config with TMC2209 HW Serial" "$3"
diff --git a/buildroot/tests/STM32F103RC_btt_USB-tests b/buildroot/tests/STM32F103RC_btt_USB-tests
index d752c87d18..8381de0ea6 100755
--- a/buildroot/tests/STM32F103RC_btt_USB-tests
+++ b/buildroot/tests/STM32F103RC_btt_USB-tests
@@ -10,9 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1
-opt_set SERIAL_PORT 1
-opt_set SERIAL_PORT_2 -1
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1
 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
 
 # clean up
diff --git a/buildroot/tests/STM32F103RC_meeb-tests b/buildroot/tests/STM32F103RC_meeb-tests
index 4fcb6e8118..3a191b4e7e 100755
--- a/buildroot/tests/STM32F103RC_meeb-tests
+++ b/buildroot/tests/STM32F103RC_meeb-tests
@@ -10,13 +10,8 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_CCROBOT_MEEB_3DP
-opt_set SERIAL_PORT 1
-opt_set SERIAL_PORT_2 -1
-opt_set X_DRIVER_TYPE TMC2208
-opt_set Y_DRIVER_TYPE TMC2208
-opt_set Z_DRIVER_TYPE TMC2208
-opt_set E0_DRIVER_TYPE TMC2208
+opt_set MOTHERBOARD BOARD_CCROBOT_MEEB_3DP SERIAL_PORT 1 SERIAL_PORT_2 -1 \
+        X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2208 Z_DRIVER_TYPE TMC2208 E0_DRIVER_TYPE TMC2208
 exec_test $1 $2 "MEEB_3DP - Basic Config with TMC2208 SW Serial" "$3"
 
 # clean up
diff --git a/buildroot/tests/STM32F103RE-tests b/buildroot/tests/STM32F103RE-tests
index 909c362d06..426f87d21b 100755
--- a/buildroot/tests/STM32F103RE-tests
+++ b/buildroot/tests/STM32F103RE-tests
@@ -10,9 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_STM32F103RE
-opt_set EXTRUDERS 2
-opt_set SERIAL_PORT -1
+opt_set MOTHERBOARD BOARD_STM32F103RE SERIAL_PORT -1 EXTRUDERS 2
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT \
            PAREN_COMMENTS GCODE_MOTION_MODES SINGLENOZZLE TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_PARK \
            BAUD_RATE_GCODE GCODE_MACROS NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE
diff --git a/buildroot/tests/STM32F103RET6_creality-tests b/buildroot/tests/STM32F103RET6_creality-tests
index 199bd6a9c2..ef020a33f1 100755
--- a/buildroot/tests/STM32F103RET6_creality-tests
+++ b/buildroot/tests/STM32F103RET6_creality-tests
@@ -19,11 +19,10 @@ opt_add SDCARD_EEPROM_EMULATION
 exec_test $1 $2 "Ender 3 v2, SD EEPROM, w/o CLASSIC_JERK" "$3"
 
 restore_configs
-opt_set SERIAL_PORT 1
-opt_set MOTHERBOARD BOARD_CREALITY_V452
+opt_set MOTHERBOARD BOARD_CREALITY_V452 SERIAL_PORT 1
 opt_disable NOZZLE_TO_PROBE_OFFSET
-opt_enable NOZZLE_AS_PROBE Z_SAFE_HOMING Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
-opt_enable PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE
+opt_enable NOZZLE_AS_PROBE Z_SAFE_HOMING Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN \
+           PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE
 exec_test $1 $2 "Creality V4.5.2 PROBE_ACTIVATION_SWITCH, Probe Tare" "$3"
 
 # clean up
diff --git a/buildroot/tests/STM32F103RE_btt-tests b/buildroot/tests/STM32F103RE_btt-tests
index ab8681c7f5..97d7ffec4b 100755
--- a/buildroot/tests/STM32F103RE_btt-tests
+++ b/buildroot/tests/STM32F103RE_btt-tests
@@ -10,12 +10,10 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP
-opt_set SERIAL_PORT 1
-opt_set SERIAL_PORT_2 -1
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2130
-exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Config with mixed TMC Drivers" "$3"
+opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP \
+        SERIAL_PORT 1 SERIAL_PORT_2 -1 \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2130
+exec_test $1 $2 "BTT SKR E3 DIP 1.0 | Mixed TMC Drivers" "$3"
 
 # clean up
 restore_configs
diff --git a/buildroot/tests/STM32F103RE_btt_USB-tests b/buildroot/tests/STM32F103RE_btt_USB-tests
index 43162b68a4..c63a90e436 100755
--- a/buildroot/tests/STM32F103RE_btt_USB-tests
+++ b/buildroot/tests/STM32F103RE_btt_USB-tests
@@ -10,16 +10,11 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP
-opt_set SERIAL_PORT 1
-opt_set SERIAL_PORT_2 -1
+opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP SERIAL_PORT 1 SERIAL_PORT_2 -1
 exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Configuration" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_CR6
-opt_set SERIAL_PORT -1
-opt_set SERIAL_PORT_2 2
-opt_set TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_BTT_SKR_CR6 SERIAL_PORT -1 SERIAL_PORT_2 2 TEMP_SENSOR_BED 1
 opt_enable CR10_STOCKDISPLAY \
            NOZZLE_AS_PROBE Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN Z_SAFE_HOMING \
            PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE \
diff --git a/buildroot/tests/STM32F401VE_STEVAL-tests b/buildroot/tests/STM32F401VE_STEVAL-tests
index d7c90e7907..1704f3d2f0 100755
--- a/buildroot/tests/STM32F401VE_STEVAL-tests
+++ b/buildroot/tests/STM32F401VE_STEVAL-tests
@@ -8,8 +8,7 @@ set -e
 
 # Build examples
 restore_configs
-opt_set MOTHERBOARD BOARD_STEVAL_3DP001V1
-opt_set SERIAL_PORT -1
+opt_set MOTHERBOARD BOARD_STEVAL_3DP001V1 SERIAL_PORT -1
 exec_test $1 $2 "STM32F401VE_STEVAL Default Config" "$3"
 
 # cleanup
diff --git a/buildroot/tests/esp32-tests b/buildroot/tests/esp32-tests
index 310eea298e..a0f79107cf 100755
--- a/buildroot/tests/esp32-tests
+++ b/buildroot/tests/esp32-tests
@@ -10,30 +10,19 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
+opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32 TX_BUFFER_SIZE 64 \
+        WIFI_SSID '"ssid"' WIFI_PWD '"password"'
 opt_enable WIFISUPPORT WEBSUPPORT GCODE_MACROS BAUD_RATE_GCODE M115_GEOMETRY_REPORT REPETIER_GCODE_M360
-opt_add WIFI_SSID "\"ssid\""
-opt_add WIFI_PWD "\"password\""
-opt_set TX_BUFFER_SIZE 64
 exec_test $1 $2 "ESP32 with WIFISUPPORT and WEBSUPPORT" "$3"
 
 #
 # Build with TMC drivers using hardware serial
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2208
-opt_set Z_DRIVER_TYPE TMC2209
-opt_set E0_DRIVER_TYPE TMC2209
-opt_set X_HARDWARE_SERIAL Serial1
-opt_set Y_HARDWARE_SERIAL Serial1
-opt_set Z_HARDWARE_SERIAL Serial1
-opt_set E0_HARDWARE_SERIAL Serial1
-opt_set X_SLAVE_ADDRESS 0
-opt_set Y_SLAVE_ADDRESS 1
-opt_set Z_SLAVE_ADDRESS 2
-opt_set E0_SLAVE_ADDRESS 3
+opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32 \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2208 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209 \
+        X_HARDWARE_SERIAL Serial1 Y_HARDWARE_SERIAL Serial1 Z_HARDWARE_SERIAL Serial1 E0_HARDWARE_SERIAL Serial1 \
+        X_SLAVE_ADDRESS 0 Y_SLAVE_ADDRESS 1 Z_SLAVE_ADDRESS 2 E0_SLAVE_ADDRESS 3
 opt_enable HOTEND_IDLE_TIMEOUT SOFTWARE_DRIVER_ENABLE
 exec_test $1 $2 "ESP32, TMC HW Serial, Hotend Idle" "$3"
 
diff --git a/buildroot/tests/linux_native-tests b/buildroot/tests/linux_native-tests
index 711691fb9d..0153687eac 100755
--- a/buildroot/tests/linux_native-tests
+++ b/buildroot/tests/linux_native-tests
@@ -10,8 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_LINUX_RAMPS
-opt_set TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_LINUX_RAMPS TEMP_SENSOR_BED 1
 opt_enable PIDTEMPBED EEPROM_SETTINGS BAUD_RATE_GCODE
 exec_test $1 $2 "Linux with EEPROM" "$3"
 
diff --git a/buildroot/tests/mega1280-tests b/buildroot/tests/mega1280-tests
index 9110e9feb6..8b16b1dbc8 100755
--- a/buildroot/tests/mega1280-tests
+++ b/buildroot/tests/mega1280-tests
@@ -16,29 +16,25 @@ set -e
 # Test MESH_BED_LEVELING feature, with LCD
 #
 restore_configs
-opt_set LCD_LANGUAGE an
+opt_set LCD_LANGUAGE an \
+        POWER_MONITOR_CURRENT_PIN 14 POWER_MONITOR_VOLTAGE_PIN 15 \
+        CLOSED_LOOP_ENABLE_PIN 44 CLOSED_LOOP_MOVE_COMPLETE_PIN 45
 opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
            EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            SENSORLESS_BACKOFF_MM HOMING_BACKOFF_POST_MM HOME_Y_BEFORE_X CODEPENDENT_XY_HOMING \
            MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
            G26_MESH_VALIDATION MESH_EDIT_MENU GCODE_QUOTED_STRINGS \
            EXTERNAL_CLOSED_LOOP_CONTROLLER POWER_MONITOR_CURRENT POWER_MONITOR_VOLTAGE
-opt_set POWER_MONITOR_CURRENT_PIN 14
-opt_set POWER_MONITOR_VOLTAGE_PIN 15
-opt_set CLOSED_LOOP_ENABLE_PIN 44
-opt_set CLOSED_LOOP_MOVE_COMPLETE_PIN 45
 exec_test $1 $2 "Spindle, MESH_BED_LEVELING, closed loop, Power Monitor, and LCD" "$3"
 
 #
 # Test DUAL_X_CARRIAGE
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_ZRIB_V52
-opt_set LCD_LANGUAGE pt
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
+opt_set MOTHERBOARD BOARD_ZRIB_V52 \
+        LCD_LANGUAGE pt REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 \
+        EXTRUDERS 2 TEMP_SENSOR_1 1
 opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE REPRAPWORLD_KEYPAD
-opt_set REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
 exec_test $1 $2 "ZRIB_V52 | DUAL_X_CARRIAGE" "$3"
 
 #
diff --git a/buildroot/tests/mega2560-tests b/buildroot/tests/mega2560-tests
index d74aa30f88..d961ab4eff 100755
--- a/buildroot/tests/mega2560-tests
+++ b/buildroot/tests/mega2560-tests
@@ -16,17 +16,10 @@ set -e
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
 #
 use_example_configs AnimationExample
-opt_set SHOW_CUSTOM_BOOTSCREEN
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
-opt_set LCD_LANGUAGE fr
-opt_set EXTRUDERS 5
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_2 5
-opt_set TEMP_SENSOR_3 20
-opt_set TEMP_SENSOR_4 1000
-opt_set TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr \
+        EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
-           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING BOOT_MARLIN_LOGO_SMALL \
+           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
            SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES CANCEL_OBJECTS SOUND_MENU_ITEM \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \
            MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE EXTRA_LIN_ADVANCE_K QUICK_HOME \
@@ -38,26 +31,18 @@ exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..."
 # Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language
 #
 use_example_configs AnimationExample
-opt_set SHOW_CUSTOM_BOOTSCREEN
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
-opt_set LCD_LANGUAGE fr
-opt_set EXTRUDERS 5
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_2 5
-opt_set TEMP_SENSOR_3 20
-opt_set TEMP_SENSOR_4 1000
-opt_set TEMP_SENSOR_BED 1
-opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
-           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING BOOT_MARLIN_LOGO_SMALL \
-           SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT SCROLL_LONG_FILENAMES CANCEL_OBJECTS NO_SD_AUTOSTART \
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana \
+        EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
+           LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES \
+           SDSUPPORT SDCARD_SORT_ALPHA NO_SD_AUTOSTART USB_FLASH_DRIVE_SUPPORT CANCEL_OBJECTS \
+           Z_PROBE_SLED AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \
            MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE QUICK_HOME \
-           LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
-           BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL \
-           Z_PROBE_SLED SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE
-opt_set LCD_LANGUAGE jp_kana
+           NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL \
+           SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
+           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING BABYSTEP_HOTEND_Z_OFFSET BABYSTEP_DISPLAY_TOTAL
 opt_disable SEGMENT_LEVELED_MOVES
-opt_enable BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING BABYSTEP_HOTEND_Z_OFFSET BABYSTEP_DISPLAY_TOTAL M114_DETAIL
 exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE | Sled Probe | Skew | JP-Kana | Babystep offsets ..." "$3"
 
 
@@ -65,25 +50,16 @@ exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE | Sle
 # 5 runout sensors with distinct states
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
-opt_set EXTRUDERS 5
-opt_set NUM_SERVOS 1
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_2 1
-opt_set TEMP_SENSOR_3 1
-opt_set TEMP_SENSOR_4 1
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO NUM_SERVOS 1 \
+        EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 \
+        NUM_RUNOUT_SENSORS 5 FIL_RUNOUT2_PIN 44 FIL_RUNOUT3_PIN 45 FIL_RUNOUT4_PIN 46 FIL_RUNOUT5_PIN 47 \
+        FIL_RUNOUT3_STATE HIGH
 opt_enable VIKI2 BOOT_MARLIN_LOGO_ANIMATED SDSUPPORT AUTO_REPORT_SD_STATUS \
            Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE \
            EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
            NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
            DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \
            FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE Z_SAFE_HOMING FIL_RUNOUT3_PULLUP
-opt_set NUM_RUNOUT_SENSORS 5
-opt_set FIL_RUNOUT2_PIN 44
-opt_set FIL_RUNOUT3_PIN 45
-opt_set FIL_RUNOUT3_STATE HIGH
-opt_set FIL_RUNOUT4_PIN 46
-opt_set FIL_RUNOUT5_PIN 47
 exec_test $1 $2 "Multiple runout sensors (x5) | Distinct runout states" "$3"
 
 
@@ -91,27 +67,19 @@ exec_test $1 $2 "Multiple runout sensors (x5) | Distinct runout states" "$3"
 # Mixing Extruder with 5 steppers, Greek
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
-opt_set LCD_LANGUAGE el_gr
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \
+        NUM_RUNOUT_SENSORS E_STEPPERS FIL_RUNOUT2_PIN 16 FIL_RUNOUT3_PIN 17 FIL_RUNOUT4_PIN 4 FIL_RUNOUT5_PIN 5
 opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_IGNORE_Z \
            FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE
-opt_set MIXING_STEPPERS 5
-opt_set NUM_RUNOUT_SENSORS E_STEPPERS
-opt_set FIL_RUNOUT2_PIN 16
-opt_set FIL_RUNOUT3_PIN 17
-opt_set FIL_RUNOUT4_PIN  4
-opt_set FIL_RUNOUT5_PIN  5
-opt_set LCD_LANGUAGE ru
 exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 
 #
 # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
 #
 #restore_configs
-#opt_set MOTHERBOARD BOARD_BQ_ZUM_MEGA_3D
-#opt_set LCD_FEEDBACK_FREQUENCY_DURATION_MS 10
-#opt_set LCD_FEEDBACK_FREQUENCY_HZ 100
+#opt_set MOTHERBOARD BOARD_BQ_ZUM_MEGA_3D \
+#        LCD_FEEDBACK_FREQUENCY_DURATION_MS 10 LCD_FEEDBACK_FREQUENCY_HZ 100
 #opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER
 
 #
@@ -153,10 +121,7 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 #
 #restore_configs
 #opt_enable G3D_PANEL SDSUPPORT SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES
-#opt_set SDSORT_GCODE true
-#opt_set SDSORT_USES_RAM true
-#opt_set SDSORT_USES_STACK true
-#opt_set SDSORT_CACHE_NAMES true
+#opt_set SDSORT_GCODE true SDSORT_USES_RAM true SDSORT_USES_STACK true SDSORT_CACHE_NAMES true
 #exec_test $1 $2 "Stuff" "$3"
 #
 # REPRAPWORLD_KEYPAD
diff --git a/buildroot/tests/mks_robin_lite-tests b/buildroot/tests/mks_robin_lite-tests
index c4be4f206d..49ef004871 100755
--- a/buildroot/tests/mks_robin_lite-tests
+++ b/buildroot/tests/mks_robin_lite-tests
@@ -7,10 +7,8 @@
 set -e
 
 restore_configs
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_LITE
-opt_set SERIAL_PORT 1
-opt_enable EEPROM_SETTINGS
-opt_enable SDSUPPORT
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_LITE SERIAL_PORT 1
+opt_enable EEPROM_SETTINGS SDSUPPORT
 exec_test $1 $2 "Default Configuration with Fallback SD EEPROM" "$3"
 
 # cleanup
diff --git a/buildroot/tests/mks_robin_mini-tests b/buildroot/tests/mks_robin_mini-tests
index 6675634f30..29baee8818 100755
--- a/buildroot/tests/mks_robin_mini-tests
+++ b/buildroot/tests/mks_robin_mini-tests
@@ -8,9 +8,7 @@
 set -e
 
 use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_MINI
-opt_set EXTRUDERS 1
-opt_set TEMP_SENSOR_1 0
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_MINI EXTRUDERS 1 TEMP_SENSOR_1 0
 exec_test $1 $2 "MKS Robin mini" "$3"
 
 # cleanup
diff --git a/buildroot/tests/mks_robin_nano35-tests b/buildroot/tests/mks_robin_nano35-tests
index 6e2f9f1b0c..7ab592aaa3 100755
--- a/buildroot/tests/mks_robin_nano35-tests
+++ b/buildroot/tests/mks_robin_nano35-tests
@@ -49,11 +49,9 @@ exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI" "$3"
 # (Robin v2 nano has no FSMC interface)
 #
 use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
 opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
 opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2209
 exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
 
 #
diff --git a/buildroot/tests/mks_robin_nano35_stm32-tests b/buildroot/tests/mks_robin_nano35_stm32-tests
index 696fb94069..0891744692 100755
--- a/buildroot/tests/mks_robin_nano35_stm32-tests
+++ b/buildroot/tests/mks_robin_nano35_stm32-tests
@@ -58,11 +58,9 @@ exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI" "$3"
 # (Robin v2 nano has no FSMC interface)
 #
 # use_example_configs Mks/Robin
-# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
 # opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
 # opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
-# opt_set X_DRIVER_TYPE TMC2209
-# opt_set Y_DRIVER_TYPE TMC2209
 # exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
 
 # cleanup
diff --git a/buildroot/tests/mks_robin_pro-tests b/buildroot/tests/mks_robin_pro-tests
index 3503d0ce1f..4b38ab97b6 100755
--- a/buildroot/tests/mks_robin_pro-tests
+++ b/buildroot/tests/mks_robin_pro-tests
@@ -8,13 +8,11 @@ set -e
 
 use_example_configs Mks/Robin_Pro
 opt_enable EMERGENCY_PARSER
-opt_set SERIAL_PORT 3
-opt_disable SERIAL_PORT_2
-opt_set SDCARD_CONNECTION LCD
-opt_set X_DRIVER_TYPE TMC2209
-opt_set Y_DRIVER_TYPE TMC2130
-opt_set TEMP_SENSOR_BED 1
-opt_disable THERMAL_PROTECTION_HOTENDS
+opt_set SERIAL_PORT 3 \
+        SDCARD_CONNECTION LCD \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2130 \
+        TEMP_SENSOR_BED 1
+opt_disable SERIAL_PORT_2 THERMAL_PROTECTION_HOTENDS
 exec_test $1 $2 "MKS Robin Pro, TMC Drivers, no thermal protection" "$3"
 
 # cleanup
diff --git a/buildroot/tests/rambo-tests b/buildroot/tests/rambo-tests
index 02ecf5d3fc..5da4eed9b4 100755
--- a/buildroot/tests/rambo-tests
+++ b/buildroot/tests/rambo-tests
@@ -10,22 +10,14 @@ set -e
 # Lots of options - Formerly the first Mega2560 test
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMBO
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_0 -2
-opt_set TEMP_SENSOR_1 1
-opt_set TEMP_SENSOR_BED 2
-opt_set TEMP_SENSOR_PROBE 1
-opt_add TEMP_PROBE_PIN 12
-opt_set TEMP_SENSOR_CHAMBER 3
-opt_add TEMP_CHAMBER_PIN 3
-opt_add HEATER_CHAMBER_PIN 45
-opt_set GRID_MAX_POINTS_X 16
-opt_set FANMUX0_PIN 53
-opt_set Z_HOME_DIR 1
-opt_enable USE_ZMAX_PLUG
+opt_set MOTHERBOARD BOARD_RAMBO \
+        EXTRUDERS 2 TEMP_SENSOR_0 -2 TEMP_SENSOR_1 1 TEMP_SENSOR_BED 2 \
+        TEMP_SENSOR_PROBE 1 TEMP_PROBE_PIN 12 \
+        TEMP_SENSOR_CHAMBER 3 TEMP_CHAMBER_PIN 3 HEATER_CHAMBER_PIN 45 \
+        Z_HOME_DIR 1 GRID_MAX_POINTS_X 16 \
+        FANMUX0_PIN 53
 opt_disable USE_ZMIN_PLUG Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN USE_WATCHDOG
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
+opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
            FIX_MOUNTED_PROBE CODEPENDENT_XY_HOMING PIDTEMPBED PROBE_TEMP_COMPENSATION \
            PREHEAT_BEFORE_PROBING PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
            EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
@@ -50,12 +42,10 @@ exec_test $1 $2 "RAMBO | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear |
 # Full size Rambo Dual Endstop CNC
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMBO
-opt_set EXTRUDERS 0
-opt_set TEMP_SENSOR_0 999
-opt_set DUMMY_THERMISTOR_999_VALUE 170
-opt_set DIGIPOT_MOTOR_CURRENT '{ 120, 120, 120, 120, 120 }'
-opt_set LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }'
+opt_set MOTHERBOARD BOARD_RAMBO \
+        EXTRUDERS 0 TEMP_SENSOR_0 999 DUMMY_THERMISTOR_999_VALUE 170 \
+        DIGIPOT_MOTOR_CURRENT '{ 120, 120, 120, 120, 120 }' \
+        LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }'
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \
            S_CURVE_ACCELERATION X_DUAL_STEPPER_DRIVERS X_DUAL_ENDSTOPS Y_DUAL_STEPPER_DRIVERS Y_DUAL_ENDSTOPS \
@@ -68,9 +58,7 @@ exec_test $1 $2 "Rambo CNC Configuration" "$3"
 # Rambo heated bed only
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMBO
-opt_set EXTRUDERS 0
-opt_set TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_RAMBO EXTRUDERS 0 TEMP_SENSOR_BED 1
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 exec_test $1 $2 "Rambo heated bed only" "$3"
 
@@ -78,18 +66,18 @@ exec_test $1 $2 "Rambo heated bed only" "$3"
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_EINSY_RAMBO
-opt_set X_DRIVER_TYPE TMC2130
-opt_set Y_DRIVER_TYPE TMC2130
-opt_set Z_DRIVER_TYPE TMC2130
-opt_set E0_DRIVER_TYPE TMC2130
+opt_set MOTHERBOARD BOARD_EINSY_RAMBO \
+        X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2130 Z_DRIVER_TYPE TMC2130 E0_DRIVER_TYPE TMC2130
 exec_test $1 $2 "Einsy RAMBo with TMC2130" "$3"
 
 #
 # Test MINIRAMBO with PWM_MOTOR_CURRENT and many features
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_MINIRAMBO
+opt_set MOTHERBOARD BOARD_MINIRAMBO \
+        CONTROLLERFAN_SPEED_IDLE 128 \
+        PWM_MOTOR_CURRENT '{ 1300, 1300, 1250 }' \
+        I2C_SLAVE_ADDRESS 63
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
           SDSUPPORT PCA9632 SOUND_MENU_ITEM GCODE_REPEAT_MARKERS \
           AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
@@ -98,23 +86,23 @@ opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CO
           NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
           ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES \
           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL
-opt_set CONTROLLERFAN_SPEED_IDLE 128
 opt_add M100_FREE_MEMORY_DUMPER
 opt_add M100_FREE_MEMORY_CORRUPTOR
-opt_set PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
-opt_set I2C_SLAVE_ADDRESS 63
 exec_test $1 $2 "MINIRAMBO | RRDGFSC | M100 | PWM_MOTOR_CURRENT | PRINTCOUNTER | Advanced Pause ..." "$3"
 
 #
 # Test many less common options
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMBO
-opt_set TEMP_SENSOR_0 -2
-opt_set DIGIPOT_I2C_NUM_CHANNELS 5
-opt_set LCD_LANGUAGE it
-opt_set MIXING_STEPPERS 2
-opt_set SERVO_DELAY "{ 300, 300, 300 }"
+opt_set MOTHERBOARD BOARD_RAMBO \
+        TEMP_SENSOR_0 -2 \
+        DIGIPOT_I2C_NUM_CHANNELS 5 \
+        LCD_LANGUAGE it \
+        MIXING_STEPPERS 2 \
+        SERVO_DELAY '{ 300, 300, 300 }' \
+        CONTROLLER_FAN_PIN X_MAX_PIN FILWIDTH_PIN 5 \
+        FAN_MIN_PWM 50 FAN_KICKSTART_TIME 100 \
+        XY_FREQUENCY_LIMIT 15
 opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
            BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
@@ -124,11 +112,6 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
            SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT ADVANCED_OK M114_DETAIL \
            VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_USE_Z_ONLY
-opt_set CONTROLLER_FAN_PIN X_MAX_PIN
-opt_set FAN_MIN_PWM 50
-opt_set FAN_KICKSTART_TIME 100
-opt_set XY_FREQUENCY_LIMIT 15
-opt_add FILWIDTH_PIN 5
 exec_test $1 $2 "Rambo | CoreXY, Gradient Mix | Endstop Int. | Home Y > X | FW Retract ..." "$3"
 
 # clean up
diff --git a/buildroot/tests/rumba32-tests b/buildroot/tests/rumba32-tests
index 20a640efed..f26af33610 100755
--- a/buildroot/tests/rumba32-tests
+++ b/buildroot/tests/rumba32-tests
@@ -8,31 +8,23 @@ set -e
 
 # Build examples
 restore_configs
-opt_set MOTHERBOARD BOARD_RUMBA32_V1_0
-opt_set SERIAL_PORT -1
+opt_set MOTHERBOARD BOARD_RUMBA32_V1_0 SERIAL_PORT -1 \
+        TEMP_SENSOR_BED 1 X_DRIVER_TYPE TMC2130
 opt_disable PIDTEMP
 opt_enable PIDTEMPBED
-opt_set TEMP_SENSOR_BED 1
 opt_disable THERMAL_PROTECTION_BED
-opt_set X_DRIVER_TYPE TMC2130
 exec_test $1 $2 "RUMBA32 V1.0 with TMC2130, PID Bed, and bed thermal protection disabled" "$3"
 
 # Build examples
 restore_configs
-opt_set MOTHERBOARD BOARD_RUMBA32_V1_1
-opt_set SERIAL_PORT -1
+opt_set MOTHERBOARD BOARD_RUMBA32_V1_1 SERIAL_PORT -1 \
+        TEMP_SENSOR_BED 1 X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2208
 opt_enable PIDTEMPBED EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-opt_set TEMP_SENSOR_BED 1
-opt_set X_DRIVER_TYPE TMC2130
-opt_set Y_DRIVER_TYPE TMC2208
 exec_test $1 $2 "RUMBA32 V1.1 with TMC2130, TMC2208, PID Bed, EEPROM settings, and graphic LCD controller" "$3"
 
 # Build examples
 restore_configs
-opt_set MOTHERBOARD BOARD_RUMBA32_MKS
-opt_set SERIAL_PORT -1
-opt_set X_DRIVER_TYPE TMC2130
-opt_set Y_DRIVER_TYPE TMC2208
+opt_set MOTHERBOARD BOARD_RUMBA32_MKS SERIAL_PORT -1 X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2208
 exec_test $1 $2 "RUMBA32 MKS Default Config with Mixed TMC Drivers" "$3"
 
 # cleanup
diff --git a/buildroot/tests/sanguino1284p-tests b/buildroot/tests/sanguino1284p-tests
index 55cdf418da..7c2aa61f69 100755
--- a/buildroot/tests/sanguino1284p-tests
+++ b/buildroot/tests/sanguino1284p-tests
@@ -10,10 +10,10 @@ set -e
 # Start with default configurations...
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12
-opt_set LCD_LANGUAGE de
+opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12 \
+        LCD_LANGUAGE de \
+        CONTROLLER_FAN_PIN 27
 opt_enable MINIPANEL USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE
-opt_set CONTROLLER_FAN_PIN 27
 exec_test $1 $2 "Default Configuration | MINIPANAL | CONTROLLER_FAN" "$3"
 
 #
diff --git a/buildroot/tests/teensy31-tests b/buildroot/tests/teensy31-tests
index cf01d27461..10dde2be99 100755
--- a/buildroot/tests/teensy31-tests
+++ b/buildroot/tests/teensy31-tests
@@ -22,9 +22,10 @@ exec_test $1 $2 "Teensy3.1 with Zero Endstops" "$3"
 # Test many features together
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
-opt_set TEMP_SENSOR_0 1
-opt_set TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_TEENSY31_32 \
+        TEMP_SENSOR_0 1 TEMP_SENSOR_BED 1 \
+        I2C_SLAVE_ADDRESS 63 \
+        GRID_MAX_POINTS_X 16
 opt_enable EEPROM_SETTINGS FILAMENT_WIDTH_SENSOR CALIBRATION_GCODE BAUD_RATE_GCODE \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR DEBUG_LEVELING_FEATURE Z_MIN_PROBE_REPEATABILITY_TEST \
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET PRINTCOUNTER SLOW_PWM_HEATERS PIDTEMPBED \
@@ -33,6 +34,4 @@ opt_enable EEPROM_SETTINGS FILAMENT_WIDTH_SENSOR CALIBRATION_GCODE BAUD_RATE_GCO
            ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES \
            PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
-opt_set I2C_SLAVE_ADDRESS 63
-opt_set GRID_MAX_POINTS_X 16
 exec_test $1 $2 "Teensy3.1 with many features" "$3"
diff --git a/buildroot/tests/teensy35-tests b/buildroot/tests/teensy35-tests
index 79998a26d3..c4d007cd62 100755
--- a/buildroot/tests/teensy35-tests
+++ b/buildroot/tests/teensy35-tests
@@ -14,11 +14,10 @@ exec_test $1 $2 "Teensy3.5 with default config" "$3"
 # Test as many features together as possible
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY35_36
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_0 1
-opt_set TEMP_SENSOR_1 5
-opt_set TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_TEENSY35_36 \
+        EXTRUDERS 2 TEMP_SENSOR_0 1 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 \
+        I2C_SLAVE_ADDRESS 63 \
+        GRID_MAX_POINTS_X 16
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE SOUND_MENU_ITEM \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
@@ -27,8 +26,6 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT
            ADVANCED_PAUSE_FEATURE ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES PARK_HEAD_ON_PAUSE \
            PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
-opt_set I2C_SLAVE_ADDRESS 63
-opt_set GRID_MAX_POINTS_X 16
 exec_test $1 $2 "Teensy3.5 with many features" "$3"
 
 #
@@ -43,10 +40,9 @@ exec_test $1 $2 "Sled Z Probe with Linear leveling" "$3"
 # Test a Servo Probe
 #
 # restore_configs
-# opt_set MOTHERBOARD BOARD_TEENSY35_36
+# opt_set MOTHERBOARD BOARD_TEENSY35_36 NUM_SERVOS 1
 # opt_enable Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE \
 #            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
-# opt_set NUM_SERVOS 1
 # exec_test $1 $2 "Servo Probe"
 #
 # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
@@ -59,28 +55,23 @@ exec_test $1 $2 "Sled Z Probe with Linear leveling" "$3"
 # Test MAGNETIC_PARKING_EXTRUDER with LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY35_36
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
-opt_enable MAGNETIC_PARKING_EXTRUDER ULTIMAKERCONTROLLER
+opt_set MOTHERBOARD BOARD_TEENSY35_36 EXTRUDERS 2 TEMP_SENSOR_1 1 SOL0_PIN 29
+opt_enable PARKING_EXTRUDER ULTIMAKERCONTROLLER
 exec_test $1 $2 "MAGNETIC_PARKING_EXTRUDER with LCD" "$3"
 
 #
 # Mixing Extruder
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY35_36
+opt_set MOTHERBOARD BOARD_TEENSY35_36 MIXING_STEPPERS 2
 opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-opt_set MIXING_STEPPERS 2
 exec_test $1 $2 "Mixing Extruder" "$3"
 
 #
 # Test SWITCHING_EXTRUDER
 #
 # restore_configs
-# opt_set MOTHERBOARD BOARD_TEENSY35_36
-# opt_set EXTRUDERS 2
-# opt_set NUM_SERVOS 1
+# opt_set MOTHERBOARD BOARD_TEENSY35_36 EXTRUDERS 2 NUM_SERVOS 1
 # opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
 # exec_test $1 $2 "SWITCHING_EXTRUDER"
 
@@ -88,15 +79,11 @@ exec_test $1 $2 "Mixing Extruder" "$3"
 # Enable COREXY
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY35_36
-opt_enable COREXY
-opt_set X_DRIVER_TYPE TMC5160
-opt_set Y_DRIVER_TYPE TMC5160
-opt_set X_MIN_ENDSTOP_INVERTING true
-opt_set Y_MIN_ENDSTOP_INVERTING true
-opt_add X_CS_PIN 46
-opt_add Y_CS_PIN 47
-opt_enable USE_ZMIN_PLUG MONITOR_DRIVER_STATUS SENSORLESS_HOMING
+opt_set MOTHERBOARD BOARD_TEENSY35_36 \
+        X_DRIVER_TYPE TMC5160 Y_DRIVER_TYPE TMC5160 \
+        X_MIN_ENDSTOP_INVERTING true Y_MIN_ENDSTOP_INVERTING true \
+        X_CS_PIN 46 Y_CS_PIN 47
+opt_enable COREXY USE_ZMIN_PLUG MONITOR_DRIVER_STATUS SENSORLESS_HOMING
 exec_test $1 $2 "Teensy 3.5/3.6 COREXY" "$3"
 
 #
@@ -111,11 +98,9 @@ exec_test $1 $2 "Teensy 3.5/3.6 COREXZ" "$3"
 # Enable Dual Z with Dual Z endstops
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY35_36
-opt_set NUM_Z_STEPPER_DRIVERS 2
+opt_set MOTHERBOARD BOARD_TEENSY35_36 NUM_Z_STEPPER_DRIVERS 2 Z2_MAX_PIN 2
 opt_enable Z_MULTI_ENDSTOPS USE_XMAX_PLUG
 pins_set ramps/RAMPS X_MAX_PIN -1
-opt_add Z2_MAX_PIN 2
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"
 
 # Clean up
diff --git a/buildroot/tests/teensy41-tests b/buildroot/tests/teensy41-tests
index 6829045496..6074b5dc5f 100755
--- a/buildroot/tests/teensy41-tests
+++ b/buildroot/tests/teensy41-tests
@@ -14,11 +14,10 @@ exec_test $1 $2 "Teensy4.1 with default config" "$3"
 # Test as many features together as possible
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY41
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_0 1
-opt_set TEMP_SENSOR_1 5
-opt_set TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_TEENSY41 \
+        EXTRUDERS 2 TEMP_SENSOR_0 1 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 \
+        I2C_SLAVE_ADDRESS 63 \
+        GRID_MAX_POINTS_X 16
 opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
            FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
@@ -28,8 +27,6 @@ opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
            PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
 opt_add EXTUI_EXAMPLE
-opt_set I2C_SLAVE_ADDRESS 63
-opt_set GRID_MAX_POINTS_X 16
 exec_test $1 $2 "Teensy4.1 with many features" "$3"
 
 #
@@ -60,10 +57,8 @@ exec_test $1 $2 "Sled Z Probe with Linear leveling" "$3"
 # Test MAGNETIC_PARKING_EXTRUDER with no LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY41
-opt_set EXTRUDERS 2
-opt_set TEMP_SENSOR_1 1
-opt_set SERIAL_PORT_2 -2
+opt_set MOTHERBOARD BOARD_TEENSY41 SERIAL_PORT_2 -2 \
+        EXTRUDERS 2 TEMP_SENSOR_1 1
 opt_enable EEPROM_SETTINGS MAGNETIC_PARKING_EXTRUDER
 exec_test $1 $2 "Ethernet, EEPROM, Magnetic Parking Extruder, No LCD" "$3"
 
@@ -71,18 +66,15 @@ exec_test $1 $2 "Ethernet, EEPROM, Magnetic Parking Extruder, No LCD" "$3"
 # Mixing Extruder
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY41
+opt_set MOTHERBOARD BOARD_TEENSY41 MIXING_STEPPERS 2
 opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL
-opt_set MIXING_STEPPERS 2
 exec_test $1 $2 "Mixing Extruder" "$3"
 
 #
 # Test SWITCHING_EXTRUDER
 #
 # restore_configs
-# opt_set MOTHERBOARD BOARD_TEENSY41
-# opt_set EXTRUDERS 2
-# opt_set NUM_SERVOS 1
+# opt_set MOTHERBOARD BOARD_TEENSY41 EXTRUDERS 2 NUM_SERVOS 1
 # opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
 # exec_test $1 $2 "SWITCHING_EXTRUDER" "$3"
 
@@ -90,15 +82,11 @@ exec_test $1 $2 "Mixing Extruder" "$3"
 # Enable COREXY
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY41
-opt_enable COREXY
-opt_set X_DRIVER_TYPE TMC5160
-opt_set Y_DRIVER_TYPE TMC5160
-opt_set X_MIN_ENDSTOP_INVERTING true
-opt_set Y_MIN_ENDSTOP_INVERTING true
-opt_add X_CS_PIN 46
-opt_add Y_CS_PIN 47
-opt_enable USE_ZMIN_PLUG MONITOR_DRIVER_STATUS SENSORLESS_HOMING
+opt_set MOTHERBOARD BOARD_TEENSY41 \
+        X_DRIVER_TYPE TMC5160 Y_DRIVER_TYPE TMC5160 \
+        X_MIN_ENDSTOP_INVERTING true Y_MIN_ENDSTOP_INVERTING true \
+        X_CS_PIN 46 Y_CS_PIN 47
+opt_enable COREXY USE_ZMIN_PLUG MONITOR_DRIVER_STATUS SENSORLESS_HOMING
 exec_test $1 $2 "Teensy 4.0/4.1 COREXY" "$3"
 
 #
@@ -113,11 +101,9 @@ exec_test $1 $2 "Teensy 4.0/4.1 COREXZ" "$3"
 # Enable Dual Z with Dual Z endstops
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY41
+opt_set MOTHERBOARD BOARD_TEENSY41 NUM_Z_STEPPER_DRIVERS 2 Z2_MAX_PIN 2
 opt_enable Z_MULTI_ENDSTOPS USE_XMAX_PLUG
-opt_set NUM_Z_STEPPER_DRIVERS 2
 pins_set ramps/RAMPS X_MAX_PIN -1
-opt_add Z2_MAX_PIN 2
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"
 
 # Clean up