diff --git a/msautotest/query/6907_01.map b/msautotest/query/6907_01.map
new file mode 100644
index 0000000000..4e2ce127fa
--- /dev/null
+++ b/msautotest/query/6907_01.map
@@ -0,0 +1,29 @@
+# Test 1: mode=itemquery - matching record
+# RUN_PARMS: 6709_01_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ANOK&qitem=cty_abbr' > [RESULT_DEMIME]
+#
+# Test 2: mode=itemquery - no matching record
+# RUN_PARMS: 6709_01_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ABCD&qitem=cty_abbr' > [RESULT_DEMIME]
+MAP
+  NAME 'query'
+  EXTENT 125000 4785000 789000 5489000
+  UNITS METERS
+
+  WEB
+    QUERYFORMAT 'tmpl'
+  END
+
+  OUTPUTFORMAT
+    NAME 'tmpl'
+    DRIVER 'TEMPLATE'
+    MIMETYPE 'text/html'
+    FORMATOPTION "FILE=template/query.tmpl"
+  END
+
+  LAYER
+    NAME 'bdry_counpy2'
+    VALIDATION
+      qstring '^[A-Z]{4}$'
+    END
+    INCLUDE 'include/bdry_counpy2_shapefile.map'
+  END
+END
diff --git a/msautotest/query/6907_02.map b/msautotest/query/6907_02.map
new file mode 100644
index 0000000000..e007b0a0e4
--- /dev/null
+++ b/msautotest/query/6907_02.map
@@ -0,0 +1,30 @@
+# Test 1: mode=itemquery - matching record
+# RUN_PARMS: 6709_02_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ANOK&qitem=cty_abbr' > [RESULT_DEMIME]
+#
+# Test 2: mode=itemquery - no matching record
+# RUN_PARMS: 6709_02_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=itemquery&qlayer=bdry_counpy2&qstring=ABCD&qitem=cty_abbr' > [RESULT_DEMIME]
+MAP
+  NAME 'query'
+  EXTENT 125000 4785000 789000 5489000
+  UNITS METERS
+
+  WEB
+    EMPTY 'https://mapserver.org/'
+    QUERYFORMAT 'tmpl'
+  END
+
+  OUTPUTFORMAT
+    NAME 'tmpl'
+    DRIVER 'TEMPLATE'
+    MIMETYPE 'text/html'
+    FORMATOPTION "FILE=template/query.tmpl"
+  END
+
+  LAYER
+    NAME 'bdry_counpy2'
+    VALIDATION
+      qstring '^[A-Z]{4}$'
+    END
+    INCLUDE 'include/bdry_counpy2_shapefile.map'
+  END
+END
diff --git a/msautotest/query/6907_03.conf b/msautotest/query/6907_03.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/msautotest/query/6907_03.map b/msautotest/query/6907_03.map
new file mode 100644
index 0000000000..e69de29bb2