diff --git a/test-linuxcnc-rs274-native.sh b/test-linuxcnc-rs274-native.sh
index 3efb453..9f03c02 100755
--- a/test-linuxcnc-rs274-native.sh
+++ b/test-linuxcnc-rs274-native.sh
@@ -241,7 +241,11 @@ done
 # convert_setup() rejects disallowed G10 L2/L20 words, and
 # convert_tool_table() rejects G10 L1 table updates without offsets.
 g10_convert_error_cases=(
+    "linuxcnc_g10_l1_missing_tool_error|Requested tool 999 not found in the tool table"
     "linuxcnc_g10_l1_without_offsets_error|G10 L1 without offsets has no effect"
+    "linuxcnc_g10_l1_q_noninteger_error|Q number in G10 is not an integer"
+    "linuxcnc_g10_l1_q_negative_error|Q number in G10 is not an integer"
+    "linuxcnc_g10_l1_q_out_of_range_error|Invalid tool orientation"
     "linuxcnc_g10_l2_i_word_error|I J words not allowed with G10 L2"
     "linuxcnc_g10_l20_i_word_error|I J words not allowed with G10 L2"
     "linuxcnc_g10_l20_r_word_error|R not allowed in G10 L20"
diff --git a/test-linuxcnc-source-link.sh b/test-linuxcnc-source-link.sh
index 6c84c60..3e1aec5 100755
--- a/test-linuxcnc-source-link.sh
+++ b/test-linuxcnc-source-link.sh
@@ -685,7 +685,11 @@ done
 # convert_setup() rejects disallowed G10 L2/L20 words, and
 # convert_tool_table() rejects G10 L1 table updates without offsets.
 g10_convert_error_cases=(
+    "linuxcnc_g10_l1_missing_tool_error|Requested tool 999 not found in the tool table"
     "linuxcnc_g10_l1_without_offsets_error|G10 L1 without offsets has no effect"
+    "linuxcnc_g10_l1_q_noninteger_error|Q number in G10 is not an integer"
+    "linuxcnc_g10_l1_q_negative_error|Q number in G10 is not an integer"
+    "linuxcnc_g10_l1_q_out_of_range_error|Invalid tool orientation"
     "linuxcnc_g10_l2_i_word_error|I J words not allowed with G10 L2"
     "linuxcnc_g10_l20_i_word_error|I J words not allowed with G10 L2"
     "linuxcnc_g10_l20_r_word_error|R not allowed in G10 L20"
diff --git a/tests/gcode/linuxcnc_g10_l1_missing_tool_error.ngc b/tests/gcode/linuxcnc_g10_l1_missing_tool_error.ngc
new file mode 100644
index 0000000..22aa84a
--- /dev/null
+++ b/tests/gcode/linuxcnc_g10_l1_missing_tool_error.ngc
@@ -0,0 +1,2 @@
+G21 G90
+G10 L1 P999 X0
diff --git a/tests/gcode/linuxcnc_g10_l1_q_negative_error.ngc b/tests/gcode/linuxcnc_g10_l1_q_negative_error.ngc
new file mode 100644
index 0000000..ad173a8
--- /dev/null
+++ b/tests/gcode/linuxcnc_g10_l1_q_negative_error.ngc
@@ -0,0 +1,2 @@
+G21 G90
+G10 L1 P1 Q-2
diff --git a/tests/gcode/linuxcnc_g10_l1_q_noninteger_error.ngc b/tests/gcode/linuxcnc_g10_l1_q_noninteger_error.ngc
new file mode 100644
index 0000000..10af0d3
--- /dev/null
+++ b/tests/gcode/linuxcnc_g10_l1_q_noninteger_error.ngc
@@ -0,0 +1,2 @@
+G21 G90
+G10 L1 P1 Q1.5
diff --git a/tests/gcode/linuxcnc_g10_l1_q_out_of_range_error.ngc b/tests/gcode/linuxcnc_g10_l1_q_out_of_range_error.ngc
new file mode 100644
index 0000000..d7e1229
--- /dev/null
+++ b/tests/gcode/linuxcnc_g10_l1_q_out_of_range_error.ngc
@@ -0,0 +1,2 @@
+G21 G90
+G10 L1 P1 Q10