diff --git a/test/klippy/commands.test b/test/klippy/commands.test
new file mode 100644
index 00000000..c49a0095
--- /dev/null
+++ b/test/klippy/commands.test
@@ -0,0 +1,25 @@
+# Tests for miscellaneous g-code commands
+DICTIONARY atmega2560-16mhz.dict
+CONFIG ../../config/example.cfg
+
+# Simple status commands
+GET_POSITION
+
+STATUS
+
+HELP
+
+QUERY_ENDSTOPS
+
+# Restart command
+RESTART
+
+# Update commands
+SET_GCODE_OFFSET Z=.1
+SET_GCODE_OFFSET Z_ADJUST=-.1
+
+SET_VELOCITY_LIMIT ACCEL=100 VELOCITY=20 JUNCTION_DEVIATION=.001 ACCEL_TO_DECEL=200
+M204 S500
+
+SET_PRESSURE_ADVANCE EXTRUDER=extruder ADVANCE=.001
+SET_PRESSURE_ADVANCE ADVANCE=.002 ADVANCE_LOOKAHEAD_TIME=.001