diff --git a/test/klippy/quad_gantry_level.test b/test/klippy/quad_gantry_level.test
new file mode 100644
index 00000000..06883f91
--- /dev/null
+++ b/test/klippy/quad_gantry_level.test
@@ -0,0 +1,26 @@
+# Test case for z_tilt and quad_gantry_level
+CONFIG z_tilt.cfg
+DICTIONARY atmega2560.dict
+
+# Start by homing the printer.
+G28
+G1 Z5 X10 Y10 F6000
+GET_POSITION
+
+# Run QUAD_GANTRY_LEVEL in manual mode
+QUAD_GANTRY_LEVEL METHOD=MANUAL
+G1 Z2.909972
+ACCEPT
+G1 Z2.924972
+ACCEPT
+G1 Z2.959972
+ACCEPT
+G1 Z2.924972
+ACCEPT
+
+# Report position
+G1 Z5 X10 Y10 F6000
+GET_POSITION
+
+# Run again in automatic mode
+QUAD_GANTRY_LEVEL
diff --git a/test/klippy/z_tilt.cfg b/test/klippy/z_tilt.cfg
new file mode 100644
index 00000000..fdb54ff1
--- /dev/null
+++ b/test/klippy/z_tilt.cfg
@@ -0,0 +1,116 @@
+# Test config for z_tilt and quad_gantry_level
+[stepper_x]
+step_pin: ar54
+dir_pin: ar55
+enable_pin: !ar38
+step_distance: .0125
+endstop_pin: ^ar3
+position_endstop: 0
+position_max: 250
+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: 250
+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: 250
+
+[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
+
+[stepper_z3]
+step_pin: ar5
+dir_pin: ar4
+step_distance: .0025
+
+[quad_gantry_level]
+gantry_corners:
+    -55,-7
+    305, 320
+points:
+    25,0
+    25,200
+    225,200
+    225,0
+
+[z_tilt]
+z_positions:
+    -55,-7
+    -55,320
+    305,-7
+    305,320
+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/z_tilt.test b/test/klippy/z_tilt.test
new file mode 100644
index 00000000..ffce7d9e
--- /dev/null
+++ b/test/klippy/z_tilt.test
@@ -0,0 +1,26 @@
+# Test case for z_tilt and quad_gantry_level
+CONFIG z_tilt.cfg
+DICTIONARY atmega2560.dict
+
+# Start by homing the printer.
+G28
+G1 Z5 X10 Y10 F6000
+GET_POSITION
+
+# Run Z_TILT_ADJUST in manual mode
+Z_TILT_ADJUST METHOD=MANUAL
+G1 Z2.909972
+ACCEPT
+G1 Z2.924972
+ACCEPT
+G1 Z2.959972
+ACCEPT
+G1 Z2.924972
+ACCEPT
+
+# Report position
+G1 Z5 X10 Y10 F6000
+GET_POSITION
+
+# Run again in automatic mode
+Z_TILT_ADJUST