diff --git a/test-linuxcnc-rs274-native.sh b/test-linuxcnc-rs274-native.sh
index f220384..e4fe4e0 100755
--- a/test-linuxcnc-rs274-native.sh
+++ b/test-linuxcnc-rs274-native.sh
@@ -502,6 +502,7 @@ threading_convert_error_cases=(
     "linuxcnc_arc_inverse_time_missing_f_error|F word missing with inverse time arc move"
     "linuxcnc_g1_zero_feed_error|Cannot do g1 with zero feed rate"
     "linuxcnc_g1_inverse_time_missing_f_error|F word missing with inverse time g1 move"
+    "linuxcnc_g95_zero_spindle_speed_error|Cannot feed with zero spindle speed in feed per rev mode"
     "linuxcnc_g33_stopped_spindle_error|Spindle not turning in G33"
     "linuxcnc_g33_1_stopped_spindle_error|Spindle not turning in G33.1"
     "linuxcnc_g33_spindle_dollar_out_of_range_error|Invalid spindle (\$) number in G33 move"
diff --git a/test-linuxcnc-source-link.sh b/test-linuxcnc-source-link.sh
index d7ce3af..69dc2fe 100755
--- a/test-linuxcnc-source-link.sh
+++ b/test-linuxcnc-source-link.sh
@@ -1086,6 +1086,7 @@ threading_convert_error_cases=(
     "linuxcnc_arc_inverse_time_missing_f_error|F word missing with inverse time arc move"
     "linuxcnc_g1_zero_feed_error|Cannot do g1 with zero feed rate"
     "linuxcnc_g1_inverse_time_missing_f_error|F word missing with inverse time g1 move"
+    "linuxcnc_g95_zero_spindle_speed_error|Cannot feed with zero spindle speed in feed per rev mode"
     "linuxcnc_g33_stopped_spindle_error|Spindle not turning in G33"
     "linuxcnc_g33_1_stopped_spindle_error|Spindle not turning in G33.1"
     "linuxcnc_g33_spindle_dollar_out_of_range_error|Invalid spindle (\$) number in G33 move"
diff --git a/tests/gcode/linuxcnc_g95_zero_spindle_speed_error.ngc b/tests/gcode/linuxcnc_g95_zero_spindle_speed_error.ngc
new file mode 100644
index 0000000..e6d026a
--- /dev/null
+++ b/tests/gcode/linuxcnc_g95_zero_spindle_speed_error.ngc
@@ -0,0 +1,4 @@
+G21 G90
+G95
+F1
+G1 X1