diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml
index 39e5c333c..da90ce2ad 100644
--- a/.github/workflows/pull-request-commentor.yaml
+++ b/.github/workflows/pull-request-commentor.yaml
@@ -12,7 +12,10 @@ on:
 jobs:
   add-comment:
     # yamllint disable-line rule:line-length
-    if: github.event.label.name == 'ok-to-test' && github.event.pull_request.merged != 'true'
+    if: (github.event.pull_request.label == ok-to-test && \
+         github.event.pull_request.merged != 'true') || \
+        (github.event.pull_request.action == opened && \
+         contains(github.event.pull_request.labels.*.name,'ok-to-test'))
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write