diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 9b66e60..0d1f7bf 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -63,11 +63,8 @@
                       - "{{branch}}"
                 event:
                  comment:
-                    - added:
-                        verdictCategory: 'Code-Review'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               TEST_MODELS:
                 type: string
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 60f4f3f..a1147e7 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -135,11 +135,8 @@
                       - master
                 event:
                   comment:
-                    - added:
-                        verdictCategory: 'Code-Review'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               SALT_VERSION:
                 type: string
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index dadd255..cf695dc 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -23,11 +23,8 @@
                         name: "{{branch}}"
                 event:
                   comment:
-                    - added:
-                        verdictCategory: 'Code-Review'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               SALT_OPTS:
                 type: string
@@ -102,11 +99,8 @@
                       - master
                 event:
                   comment:
-                    - added:
-                        verdictCategory: 'CodeReview'
-                        commentAddedTriggerApprovalValue: '+1'
                     - addedContains:
-                        commentAddedCommentContains: '(recheck|reverify)'
+                        commentAddedCommentContains: "^(test|recheck|reverify)$"
             param:
               COOKIECUTTER_TEMPLATE_URL:
                 type: string