diff --git a/core/src/test/java/org/apache/calcite/test/LintTest.java b/core/src/test/java/org/apache/calcite/test/LintTest.java
index 56fa317b63f..628c930f8eb 100644
--- a/core/src/test/java/org/apache/calcite/test/LintTest.java
+++ b/core/src/test/java/org/apache/calcite/test/LintTest.java
@@ -412,6 +412,9 @@ private static void checkMessage(String subject, String body,
     if (subject2.matches("[a-z].*")) {
       consumer.accept("Message must start with upper-case letter");
     }
+    if (subject2.matches("^Chore.*\\b")) {
+      consumer.accept("Message cannot start with the Chore keyword");
+    }
 
     // Check for keywords that should be capitalized
     for (Map.Entry<String, String> entry : TERMINOLOGY_MAP.entrySet()) {