diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set
index c1de22f5e9..4b6f034bdb 100755
--- a/buildroot/bin/opt_set
+++ b/buildroot/bin/opt_set
@@ -2,4 +2,4 @@
 
 SED=$(which gsed || which sed)
 
-eval "${SED} -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/Configuration.h"
+eval "${SED} -E -i 's/(\/\/)?(#define \b${1}\b).*$/\2 ${2}/g' Marlin/Configuration.h"
diff --git a/buildroot/bin/opt_set_adv b/buildroot/bin/opt_set_adv
index 4c72c4a831..1eca929214 100755
--- a/buildroot/bin/opt_set_adv
+++ b/buildroot/bin/opt_set_adv
@@ -2,4 +2,4 @@
 
 SED=$(which gsed || which sed)
 
-eval "${SED} -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/Configuration_adv.h"
+eval "${SED} -E -i 's/(\/\/)?(#define \b${1}\b).*$/\2 ${2}/g' Marlin/Configuration_adv.h"
diff --git a/buildroot/bin/pins_set b/buildroot/bin/pins_set
index 639995e24c..5815bcf79d 100755
--- a/buildroot/bin/pins_set
+++ b/buildroot/bin/pins_set
@@ -2,4 +2,4 @@
 
 SED=$(which gsed || which sed)
 
-eval "${SED} -i 's/\(#define \b${2}\b\).*$/\1 ${3}/g' Marlin/src/pins/pins_${1}.h"
+eval "${SED} -E -i 's/(\/\/)?(#define \b${2}\b).*$/\2 ${3}/g' Marlin/src/pins/pins_${1}.h"
diff --git a/buildroot/share/tests/megaatmega2560_tests b/buildroot/share/tests/megaatmega2560_tests
index 4e5a89c5fd..443a5ce3df 100755
--- a/buildroot/share/tests/megaatmega2560_tests
+++ b/buildroot/share/tests/megaatmega2560_tests
@@ -90,7 +90,7 @@ opt_enable ULTIMAKERCONTROLLER SDSUPPORT
 opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632
 opt_enable_adv BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS
 opt_enable_adv ADVANCED_PAUSE_FEATURE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE LCD_INFO_MENU M114_DETAIL
-opt_set_adv PWM_MOTOR_CURRENT {1300,1300,1250}
+opt_set_adv PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
 opt_set_adv I2C_SLAVE_ADDRESS 63
 exec_test $1 $2 "MINIRAMBO for PWM_MOTOR_CURRENT etc"
 #