diff --git a/test/klippy/dual_carriage.cfg b/test/klippy/dual_carriage.cfg
new file mode 100644
index 00000000..fff7673a
--- /dev/null
+++ b/test/klippy/dual_carriage.cfg
@@ -0,0 +1,108 @@
+# Test config with dual carriage and multiple extruders
+[stepper_x]
+step_pin: ar54
+dir_pin: ar55
+enable_pin: !ar38
+step_distance: .0125
+endstop_pin: ^ar3
+position_endstop: 0
+position_max: 200
+homing_speed: 50
+
+[dual_carriage]
+axis: x
+step_pin: ar16
+dir_pin: ar17
+enable_pin: !ar23
+step_distance: .0125
+endstop_pin: ^ar2
+position_endstop: 200
+position_max: 200
+homing_speed: 50
+
+[stepper_y]
+step_pin: ar60
+dir_pin: !ar61
+enable_pin: !ar56
+step_distance: .0125
+endstop_pin: ^ar14
+position_endstop: 0
+position_max: 200
+homing_speed: 50
+
+[stepper_z]
+step_pin: ar46
+dir_pin: ar48
+enable_pin: !ar62
+step_distance: .0025
+endstop_pin: ^ar18
+position_endstop: 0.5
+position_max: 200
+
+[extruder]
+step_pin: ar26
+dir_pin: ar28
+enable_pin: !ar24
+step_distance: .002
+nozzle_diameter: 0.400
+filament_diameter: 1.750
+heater_pin: ar10
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: analog13
+control: pid
+pid_Kp: 22.2
+pid_Ki: 1.08
+pid_Kd: 114
+min_temp: 0
+max_temp: 250
+deactivate_gcode:
+    G90
+    G1 X0
+activate_gcode:
+    SET_DUAL_CARRIAGE CARRIAGE=0
+
+[extruder1]
+step_pin: ar36
+dir_pin: ar34
+enable_pin: !ar30
+step_distance: .002
+nozzle_diameter: 0.400
+filament_diameter: 1.750
+heater_pin: ar11
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: analog15
+control: pid
+pid_Kp: 22.2
+pid_Ki: 1.08
+pid_Kd: 114
+min_temp: 0
+max_temp: 250
+deactivate_gcode:
+    SET_SERVO SERVO=my_servo angle=100
+    G90
+    G1 X200
+activate_gcode:
+    SET_SERVO SERVO=my_servo angle=50
+    SET_DUAL_CARRIAGE CARRIAGE=1
+
+[servo my_servo]
+pin: ar7
+
+[heater_bed]
+heater_pin: ar8
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: analog14
+control: watermark
+min_temp: 0
+max_temp: 130
+
+[mcu]
+serial: /dev/ttyACM0
+pin_map: arduino
+
+[printer]
+kinematics: cartesian
+max_velocity: 300
+max_accel: 3000
+max_z_velocity: 5
+max_z_accel: 100
diff --git a/test/klippy/dual_carriage.test b/test/klippy/dual_carriage.test
new file mode 100644
index 00000000..d3781270
--- /dev/null
+++ b/test/klippy/dual_carriage.test
@@ -0,0 +1,37 @@
+# Test cases on printers with dual carriage and multiple extruders
+CONFIG dual_carriage.cfg
+DICTIONARY atmega2560-16mhz.dict
+
+# First home the printer
+G90
+G28
+
+# Perform a dummy move
+G1 X10 F6000
+
+# Activate alternate carriage
+SET_DUAL_CARRIAGE CARRIAGE=1
+G1 X190 F6000
+
+# Go back to main carriage
+SET_DUAL_CARRIAGE CARRIAGE=0
+G1 X20 F6000
+
+# Test changing extruders
+G1 X5
+T1
+G91
+G1 X-10 E.2
+T0
+G91
+G1 X20 E.2
+G90
+
+# Servo tests
+SET_SERVO servo=my_servo angle=160
+SET_SERVO servo=my_servo angle=130
+
+# Verify STEPPER_BUZZ
+STEPPER_BUZZ STEPPER=dual_carriage
+STEPPER_BUZZ STEPPER=extruder
+STEPPER_BUZZ STEPPER=extruder1