diff --git a/.buildkite/test-nightly-diffusion.yml b/.buildkite/test-nightly-diffusion.yml
index 742624e8b..04b99c0a8 100644
--- a/.buildkite/test-nightly-diffusion.yml
+++ b/.buildkite/test-nightly-diffusion.yml
@@ -13,7 +13,8 @@ steps:
     steps:
       - label: ":full_moon: Diffusion · Other · Function Test with H100"
         timeout_in_minutes: 120
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        # Shared nightly vs PR label conditional; referenced below as *nightly_or_pr_label
+        if: &nightly_or_pr_label 'build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"'
         commands:
           - pytest -s -v tests/e2e/online_serving/test_*_expansion.py -k "not test_wan22_expansion and not test_wan_2_1_vace_expansion and not test_qwen_image" -m "advanced_model and diffusion and H100" --run-level "advanced_model"
         agents:
@@ -52,7 +53,7 @@ steps:
 
       - label: ":full_moon: Diffusion · Other · Function Test with L4"
         timeout_in_minutes: 60
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - pytest -s -v tests/e2e/online_serving/test_*_expansion.py -m "advanced_model and diffusion and L4" --run-level "advanced_model"
         agents:
@@ -71,7 +72,7 @@ steps:
 
       - label: ":full_moon: Diffusion · Other · Doc Test"
         timeout_in_minutes: 60
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - export VLLM_TEST_CLEAN_GPU_MEMORY="1"
           - pytest -s -v tests/examples/online_serving/test_text_to_image.py tests/examples/offline_inference/test_text_to_image.py -m "advanced_model and example and H100" --run-level "advanced_model"
@@ -114,7 +115,7 @@ steps:
     steps:
       - label: ":full_moon: Diffusion · Wan · Function Test"
         timeout_in_minutes: 90
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - pytest -s -v tests/e2e/online_serving/test_wan22_expansion.py tests/e2e/online_serving/test_wan_2_1_vace_expansion.py -m "advanced_model" --run-level "advanced_model"
         agents:
@@ -154,7 +155,7 @@ steps:
       - label: ":full_moon: Diffusion · Wan · Accuracy Test"
         key: nightly-wan22-i2v-accuracy
         timeout_in_minutes: 180
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - pytest -s -v tests/e2e/accuracy/wan22_i2v/test_wan22_i2v_video_similarity.py --run-level advanced_model
         agents:
@@ -196,7 +197,7 @@ steps:
     steps:
       - label: ":full_moon: Diffusion · Qwen-Image · Function Test with H100"
         timeout_in_minutes: 120
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - pytest -s -v tests/e2e/online_serving/test_qwen_image*_expansion.py -m "advanced_model and diffusion and H100" --run-level "advanced_model"
         agents:
@@ -236,7 +237,7 @@ steps:
       - label: ":full_moon: Diffusion · Qwen-Image · GEBench Accuracy Test"
         key: nightly-gebench-accuracy
         timeout_in_minutes: 60
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - pytest -s -v tests/e2e/accuracy/test_gebench_h100_smoke.py --run-level advanced_model --gebench-model Qwen/Qwen-Image-2512 --accuracy-judge-model QuantTrio/Qwen3-VL-30B-A3B-Instruct-AWQ --accuracy-gpu 0 --gebench-port 8093 --accuracy-workers 1
           - buildkite-agent artifact upload "tests/e2e/accuracy/artifacts/gebench_qwen-image-2512/summary*.json"
@@ -277,7 +278,7 @@ steps:
       - label: ":full_moon: Diffusion · Qwen-Image · GEdit-Bench Accuracy Test"
         key: nightly-gedit-bench-accuracy
         timeout_in_minutes: 60
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - pytest -s -v tests/e2e/accuracy/test_gedit_bench_h100_smoke.py --run-level advanced_model --gedit-model Qwen/Qwen-Image-Edit --accuracy-judge-model QuantTrio/Qwen3-VL-30B-A3B-Instruct-AWQ --accuracy-gpu 0 --gedit-port 8093 --gedit-samples-per-group 20 --accuracy-workers 1
           - buildkite-agent artifact upload "tests/e2e/accuracy/artifacts/gedit_scores_qwen-image-edit/qwen-image-edit_all_all_vie_score_*.csv"
@@ -321,7 +322,7 @@ steps:
       - label: ":full_moon: Diffusion · Qwen-Image · Perf Test"
         key: nightly-qwen-image-performance
         timeout_in_minutes: 180
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - export DIFFUSION_BENCHMARK_DIR=tests/dfx/perf/results
           - export CACHE_DIT_VERSION=1.3.0
diff --git a/.buildkite/test-nightly.yml b/.buildkite/test-nightly.yml
index 0d1c8eacc..06b7c14ae 100644
--- a/.buildkite/test-nightly.yml
+++ b/.buildkite/test-nightly.yml
@@ -11,7 +11,8 @@ steps:
       - label: ":full_moon: Omni · Function Test with H100"
         timeout_in_minutes: 90
         depends_on: upload-nightly-pipeline
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        # Shared nightly vs PR label conditional; referenced below as *nightly_or_pr_label
+        if: &nightly_or_pr_label 'build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"'
         commands:
           - pytest -s -v tests/e2e/online_serving/test_*_expansion.py -m "advanced_model and H100 and omni" --run-level "advanced_model"
         agents:
@@ -51,7 +52,7 @@ steps:
       - label: ":full_moon: Omni · Function Test with L4"
         timeout_in_minutes: 90
         depends_on: upload-nightly-pipeline
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
           - pytest -s -v tests/e2e/online_serving/test_*_expansion.py -m "advanced_model and L4 and omni" --run-level "advanced_model"
@@ -72,7 +73,7 @@ steps:
       - label: ":full_moon: Omni · Doc Test with L4"
         timeout_in_minutes: 90
         depends_on: upload-nightly-pipeline
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
           - pytest -s -v tests/examples/ -m "advanced_model and omni and L4" --run-level "advanced_model"
@@ -93,7 +94,7 @@ steps:
       - label: ":full_moon: Omni · Doc Test with H100"
         timeout_in_minutes: 90
         depends_on: upload-nightly-pipeline
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - pytest -s -v tests/examples/ -m "advanced_model and omni and H100" --run-level "advanced_model"
         agents:
@@ -134,7 +135,7 @@ steps:
         key: nightly-omni-performance
         timeout_in_minutes: 180
         depends_on: upload-nightly-pipeline
-        if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+        if: *nightly_or_pr_label
         commands:
           - export BENCHMARK_DIR=tests/dfx/perf/results
           - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
@@ -181,7 +182,7 @@ steps:
   - label: ":card_index_dividers: Diffusion Model Test"
     key: nightly-diffusion-model-test
     depends_on: upload-nightly-pipeline
-    if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+    if: *nightly_or_pr_label
     commands:
       - buildkite-agent pipeline upload .buildkite/test-nightly-diffusion.yml
     agents:
@@ -191,7 +192,7 @@ steps:
     key: nightly-testcase-statistics
     timeout_in_minutes: 120
     depends_on: upload-nightly-pipeline
-    if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
+    if: *nightly_or_pr_label
     commands:
       - python tools/nightly/buildkite_testcase_statistics.py -o tests/dfx/perf/results/buildkite_testcase_statistics.html
       - buildkite-agent artifact upload "tests/dfx/perf/results/*.html"