diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 0d1f7bf..efb09f9 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -64,7 +64,7 @@
                 event:
                  comment:
                     - addedContains:
-                        commentAddedCommentContains: "^(test|recheck|reverify)$"
+                        commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
             param:
               TEST_MODELS:
                 type: string
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index a1147e7..7fa88e1 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -136,7 +136,7 @@
                 event:
                   comment:
                     - addedContains:
-                        commentAddedCommentContains: "^(test|recheck|reverify)$"
+                        commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
             param:
               SALT_VERSION:
                 type: string
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index cf695dc..9100510 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -24,7 +24,7 @@
                 event:
                   comment:
                     - addedContains:
-                        commentAddedCommentContains: "^(test|recheck|reverify)$"
+                        commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
             param:
               SALT_OPTS:
                 type: string
@@ -100,7 +100,7 @@
                 event:
                   comment:
                     - addedContains:
-                        commentAddedCommentContains: "^(test|recheck|reverify)$"
+                        commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
             param:
               COOKIECUTTER_TEMPLATE_URL:
                 type: string