diff --git a/tests/0-setup.bats b/tests/0-setup.bats
index a4b1476e..fd058e35 100755
--- a/tests/0-setup.bats
+++ b/tests/0-setup.bats
@@ -19,7 +19,7 @@ load libs/shared_setup
     assert_success
 
     run $phpcs --version
-    assert_output --regexp "PHP_CodeSniffer version [0-9]+\.[0-9]+\.[0-9]+ \(stable\) by Squiz \(http://www.squiz.net\)"
+    assert_output --regexp "PHP_CodeSniffer version [0-9]+\.[0-9]+\.[0-9]+ \(stable\) by Squiz and PHPCSStandards"
 }
 
 @test "GNU grep installed" {
diff --git a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh
index 07f0fa0e..73705b5f 100755
--- a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh
+++ b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh
@@ -2,7 +2,7 @@ ${basereq} --action getIssueList \
            --jql "project = 'Moodle' \
                  AND status = 'Waiting for component lead review' \
                  AND status WAS NOT 'Waiting for component lead review' ON '-${schedulemins}' \
-                 AND participants not in (tobic) \
+                 AND issue NOT IN commentedByUser('tobic') \
                  AND level IS EMPTY \
                  ORDER BY priority DESC, votes DESC, 'Last comment date' ASC" \
            --outputFormat 101 \
diff --git a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh
index f662532f..e3defa11 100755
--- a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh
+++ b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh
@@ -2,7 +2,7 @@ ${basereq} --action getIssueList \
            --jql "project = 'Moodle' \
                  AND status = 'Waiting for integration review' \
                  AND status WAS NOT 'Waiting for integration review' ON '-${schedulemins}' \
-                 AND participants not in (tobic) \
+                 AND issue NOT IN commentedByUser('tobic') \
                  AND level IS EMPTY \
                  ORDER BY priority DESC, votes DESC, 'Last comment date' ASC" \
            --outputFormat 101 \