diff --git a/test/klippy/macros.cfg b/test/klippy/macros.cfg
new file mode 100644
index 00000000..d766c9d6
--- /dev/null
+++ b/test/klippy/macros.cfg
@@ -0,0 +1,115 @@
+# Test config with macros
+[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
+
+[extruder]
+step_pin: ar26
+dir_pin: ar28
+enable_pin: !ar24
+step_distance: .004242
+nozzle_diameter: 0.500
+filament_diameter: 3.500
+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: 210
+
+[heater_bed]
+heater_pin: ar8
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: analog14
+control: watermark
+min_temp: 0
+max_temp: 110
+
+[mcu]
+serial: /dev/ttyACM0
+pin_map: arduino
+
+[printer]
+kinematics: cartesian
+max_velocity: 300
+max_accel: 3000
+max_z_velocity: 5
+max_z_accel: 100
+
+[gcode_macro TEST_SAVE_RESTORE]
+gcode:
+  SAVE_GCODE_STATE NAME=TESTIT1
+  G92 Z10
+  RESTORE_GCODE_STATE NAME=TESTIT1
+  G92 Z0
+
+[gcode_macro TEST_expression]
+gcode:
+  {% if printer.gcode.gcode_position.x != 0.0 %}
+    M112
+  {% else %}
+    { printer.gcode.action_respond_info("TEST_expression") }
+  {% endif %}
+
+[gcode_macro TEST_variable]
+variable_t: 12
+gcode:
+  { printer.gcode.action_respond_info("TEST_variable") }
+  {% if t|float - 12.0 != printer.toolhead.position.y %}
+    M112
+  {% endif %}
+  {% if printer["gcode_macro TEST_variable"].t|float - 12.0 != 0.0 %}
+    M112
+  {% endif %}
+  SET_GCODE_VARIABLE MACRO=TEST_variable VARIABLE=t VALUE=17
+  TEST_variable_part2
+
+[gcode_macro TEST_variable_part2]
+gcode:
+  { printer.gcode.action_respond_info("TEST_variable_part2") }
+  {% if printer["gcode_macro TEST_variable"].t|float != 17.0 %}
+    M112
+  {% endif %}
+
+[gcode_macro TEST_param]
+gcode:
+  { printer.gcode.action_respond_info("TEST_param") }
+  {% if params.T != "123" %}
+    M112
+  {% endif %}
+
+# Main test start point
+[gcode_macro TESTIT]
+gcode:
+  TEST_SAVE_RESTORE
+  TEST_expression
+  TEST_variable
+  TEST_param T=123
diff --git a/test/klippy/macros.test b/test/klippy/macros.test
new file mode 100644
index 00000000..61796884
--- /dev/null
+++ b/test/klippy/macros.test
@@ -0,0 +1,6 @@
+# Tests for miscellaneous g-code commands
+DICTIONARY atmega2560.dict
+CONFIG macros.cfg
+
+# Run TESTIT macro
+TESTIT