diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
index abf9580c208..11fad2d1814 100644
--- a/.buildkite/pull-requests.json
+++ b/.buildkite/pull-requests.json
@@ -9,9 +9,9 @@
             "set_commit_status": true,
             "build_on_commit": true,
             "build_on_comment": true,
-            "trigger_comment_regex": "^/test .*$",
-            "always_trigger_comment_regex": "^/test .*$",
-            "skip_ci_labels": [ ],
+            "trigger_comment_regex": "^/(?:test)",
+            "always_trigger_comment_regex": "^/(?:test)",
+            "skip_ci_labels": ["skip-ci"],
             "skip_target_branches": [ ],
             "skip_ci_on_only_changed": [ ],
             "always_require_ci_on_changed": [ ]