diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md
index bafec63645..38e9a33977 100644
--- a/firmware/CHANGELOG.md
+++ b/firmware/CHANGELOG.md
@@ -28,6 +28,7 @@ Release template (copy/paste this for new release):
  - ETB low limit is now configurable #4119
  - Advanced Trigger option: require engine phase synchronization in sequential mode #4151
  - Maintainability: frequency sensors need a simple event counter in the logs #4173
+ - TS bench test commands are now configurable #4192
 
 ### Fixed
  - Make 36-2 trigger sync parameters more generous #4132
diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp
index 58ed7e7f12..2779e2a4b5 100644
--- a/firmware/controllers/algo/defaults/default_base_engine.cpp
+++ b/firmware/controllers/algo/defaults/default_base_engine.cpp
@@ -55,6 +55,10 @@ void setDefaultBaseEngine() {
 	// Fuel pump
 	engineConfiguration->startUpFuelPumpDuration = 4;
 
+	engineConfiguration->benchTestOnTime = 4;
+	engineConfiguration->benchTestOffTime = 500;
+	engineConfiguration->benchTestCount = 3;
+
 	// Fans
 	engineConfiguration->fanOnTemperature = 95;
 	engineConfiguration->fanOffTemperature = 91;
diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp
index 5ab3e4a631..10b9e34713 100644
--- a/firmware/controllers/bench_test.cpp
+++ b/firmware/controllers/bench_test.cpp
@@ -453,7 +453,7 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) {
 	case TS_IGNITION_CATEGORY:
 		if (!running) {
 			/* WARN: fixed charge time */
-			doRunSparkBench(index, 300.0, 4.0,
+			doRunSparkBench(index, 300.0, engineConfiguration->benchTestOnTime,
 				engineConfiguration->benchTestOffTime, engineConfiguration->benchTestCount);
 		}
 		break;
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 272df270c4..740a771b7f 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2117,6 +2117,12 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		commandButton = "Solenoid #5", cmd_test_sol5
 		commandButton = "Solenoid #6", cmd_test_sol6
 
+    dialog = testOther
+        field = "Count", benchTestCount
+        field = "On Time", benchTestOnTime
+        field = "Off Time", benchTestOffTime
+        panel = testSolenoids
+
 	dialog = injectionSettingsEast, "", yAxis
 		panel = testInjectors
 		field = ""
@@ -3677,7 +3683,7 @@ dialog = tcuControls, "Transmission Settings"
 	dialog = ioTest, "Bench Test & Commands", xAxis
 		panel = testSpark
 		panel = testInjectors
-		panel = testSolenoids
+		panel = testOther
 		panel = testLuaOut
 		panel = testMisc