diff --git a/test/klippy/multi_z.cfg b/test/klippy/multi_z.cfg
new file mode 100644
index 00000000..e06a42b8
--- /dev/null
+++ b/test/klippy/multi_z.cfg
@@ -0,0 +1,100 @@
+# Test config with multiple z steppers
+[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
+
+[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
+
+[stepper_z1]
+step_pin: ar36
+dir_pin: ar34
+enable_pin: !ar30
+step_distance: .0025
+endstop_pin: ^ar19
+
+[stepper_z2]
+step_pin: ar16
+dir_pin: ar17
+enable_pin: !ar23
+step_distance: .0025
+
+[z_tilt]
+z_positions:
+    -56,-17
+    -56,322
+    311,322
+points:
+    50,50
+    50,195
+    195,195
+    195,50
+
+[bed_tilt]
+points:
+    50,50
+    50,195
+    195,195
+    195,50
+
+[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
+
+[heater_bed]
+heater_pin: ar8
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: analog14
+control: watermark
+min_temp: 0
+max_temp: 130
+
+[probe]
+pin: ar9
+z_offset: 1.15
+
+[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/multi_z.test b/test/klippy/multi_z.test
new file mode 100644
index 00000000..5d7980d7
--- /dev/null
+++ b/test/klippy/multi_z.test
@@ -0,0 +1,36 @@
+# Test case with multiple z stepper motors
+CONFIG multi_z.cfg
+DICTIONARY atmega2560-16mhz.dict
+
+# Start by homing the printer.
+G28
+G1 F6000
+
+# Z / X / Y moves
+G1 Z1
+G1 X1
+G1 Y1
+
+# Run bed_tilt_calibrate
+BED_TILT_CALIBRATE
+
+# Move again
+G1 Z5 X0 Y0
+
+# Run Z_TILT_ADJUST
+Z_TILT_ADJUST
+
+# Move again
+G1 Z2 X2 Y3
+
+# Do regular probe
+PROBE
+QUERY_PROBE
+
+# Verify stepper_buzz
+STEPPER_BUZZ STEPPER=stepper_z
+STEPPER_BUZZ STEPPER=stepper_z1
+STEPPER_BUZZ STEPPER=stepper_z2
+
+# Move again
+G1 Z9