diff --git a/.github/workflows/ci3.yml b/.github/workflows/ci3.yml
index ad153607d94c..59ea28cd0959 100644
--- a/.github/workflows/ci3.yml
+++ b/.github/workflows/ci3.yml
@@ -179,7 +179,7 @@ jobs:
 
   ci-grind:
     runs-on: ubuntu-latest
-    if: github.event_name == 'merge_group' || (github.event_name == 'push' && github.ref_name == 'master')
+    if: github.event_name == 'merge_group'
     strategy:
       matrix:
         number: [1, 2, 3, 4, 5]
diff --git a/ci3/run_test_cmd b/ci3/run_test_cmd
index 29aee562945f..bf93a2946a70 100755
--- a/ci3/run_test_cmd
+++ b/ci3/run_test_cmd
@@ -107,12 +107,13 @@ fi
 function track_test {
   local test_hash=$1
   local line=$2
-  if [ "$REF_NAME" != "master" ]; then
-    return
+
+  # We track tests in CI, and only on master or master merge queue.
+  if [[ "$CI" -eq 1 && ( "$REF_NAME" == "master" || "$REF_NAME" =~ ^gh-readonly-queue/master/ ) ]]; then
+    redis_cli LPUSH $test_hash "$(date "+%m-%d %H:%M:%S"): $(echo -e "$line")" &>/dev/null
+    # Keeps only the last 1000 lines.
+    redis_cli RTRIM $test_hash -1000 -1 &>/dev/null
   fi
-  redis_cli LPUSH $test_hash "$(date "+%m-%d %H:%M:%S"): $(echo -e "$line")" &>/dev/null
-  # Keeps only the last 1000 lines.
-  redis_cli RTRIM $test_hash -1000 -1 &>/dev/null
 }
 
 # Show PASSED and early out on success.