diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 227ddbc8..dee14f5a 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -6299,6 +6299,17 @@ START_TEST(test_bad_doctype_star)
 }
 END_TEST
 
+START_TEST(test_bad_doctype_query)
+{
+    const char *text =
+        "<!DOCTYPE 1? [ <!ENTITY foo 'bar'> ]>\n"
+        "<1?>&foo;</1?>";
+
+    expect_failure(text, XML_ERROR_INVALID_TOKEN,
+                   "'+' in document name not faulted");
+}
+END_TEST
+
 /*
  * Namespaces tests.
  */
@@ -11768,6 +11779,7 @@ make_suite(void)
     tcase_add_test(tc_basic, test_bad_doctype_utf16);
     tcase_add_test(tc_basic, test_bad_doctype_plus);
     tcase_add_test(tc_basic, test_bad_doctype_star);
+    tcase_add_test(tc_basic, test_bad_doctype_query);
 
     suite_add_tcase(s, tc_namespace);
     tcase_add_checked_fixture(tc_namespace,