diff --git a/.buildkite/pipeline.trigger.integration.tests.sh b/.buildkite/pipeline.trigger.integration.tests.sh
index 5da18fc06d..1e62058968 100755
--- a/.buildkite/pipeline.trigger.integration.tests.sh
+++ b/.buildkite/pipeline.trigger.integration.tests.sh
@@ -20,7 +20,8 @@ STACK_COMMAND_TESTS=(
 )
 
 for test in "${STACK_COMMAND_TESTS[@]}"; do
-    echo "      - label: \":go: Integration test: ${test}\""
+    test_name=${test#"test-"}
+    echo "      - label: \":go: Integration test: ${test_name}\""
     echo "        command: ./.buildkite/scripts/integration_tests.sh -t ${test}"
     echo "        agents:"
     echo "          provider: \"gcp\""
@@ -39,7 +40,12 @@ CHECK_PACKAGES_TESTS=(
 )
 for independent_agent in false true ; do
 for test in "${CHECK_PACKAGES_TESTS[@]}"; do
-    echo "      - label: \":go: Integration test: ${test} - independent_agent ${independent_agent}\""
+    label_suffix=""
+    if [[ "$independent_agent" == "true" ]]; then
+        label_suffix=" (independent agent)"
+    fi
+    test_name=${test#"test-check-packages-"}
+    echo "      - label: \":go: Integration test: ${test_name}${label_suffix}\""
     echo "        command: ./.buildkite/scripts/integration_tests.sh -t ${test}"
     echo "        agents:"
     echo "          provider: \"gcp\""
@@ -76,8 +82,12 @@ done
 pushd test/packages/parallel > /dev/null
 for independent_agent in false true; do
 for package in $(find . -maxdepth 1 -mindepth 1 -type d) ; do
+    label_suffix=""
+    if [[ "$independent_agent" == "true" ]]; then
+        label_suffix=" (independent agent)"
+    fi
     package_name=$(basename "${package}")
-    echo "      - label: \":go: Integration test: ${package_name} - independent_agent ${independent_agent}\""
+    echo "      - label: \":go: Integration test: ${package_name}${label_suffix}\""
     echo "        key: \"integration-parallel-${package_name}-agent-${independent_agent}\""
     echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-check-packages-parallel -p ${package_name}"
     echo "        env:"
@@ -93,7 +103,7 @@ done
 
 popd > /dev/null
 
-echo "      - label: \":go: Integration test: test-build-zip\""
+echo "      - label: \":go: Integration test: build-zip\""
 echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-build-zip"
 echo "        agents:"
 echo "          provider: \"gcp\""
@@ -101,14 +111,14 @@ echo "        artifact_paths:"
 echo "          - build/elastic-stack-dump/build-zip/logs/*.log"
 echo "          - build/packages/*.sig"
 
-echo "      - label: \":go: Integration test: test-install-zip\""
+echo "      - label: \":go: Integration test: install-zip\""
 echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-install-zip"
 echo "        agents:"
 echo "          provider: \"gcp\""
 echo "        artifact_paths:"
 echo "          - build/elastic-stack-dump/install-zip/logs/*.log"
 
-echo "      - label: \":go: Integration test: test-install-zip-shellinit\""
+echo "      - label: \":go: Integration test: install-zip-shellinit\""
 echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-install-zip-shellinit"
 echo "        agents:"
 echo "          provider: \"gcp\""
@@ -116,15 +126,19 @@ echo "        artifact_paths:"
 echo "          - build/elastic-stack-dump/install-zip-shellinit/logs/*.log"
 
 for independent_agent in false true; do
-echo "      - label: \":go: Integration test: test-system-test-flags - independent_agent ${independent_agent}\""
-echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-system-test-flags"
-echo "        agents:"
-echo "          provider: \"gcp\""
-echo "        env:"
-echo "          ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: ${independent_agent}"
+    label_suffix=""
+    if [[ "$independent_agent" == "true" ]]; then
+        label_suffix=" (independent agent)"
+    fi
+    echo "      - label: \":go: Integration test: system-flags${label_suffix}\""
+    echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-system-test-flags"
+    echo "        agents:"
+    echo "          provider: \"gcp\""
+    echo "        env:"
+    echo "          ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: ${independent_agent}"
 done
 
-echo "      - label: \":go: Integration test: test-profiles-command\""
+echo "      - label: \":go: Integration test: profiles-command\""
 echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-profiles-command"
 echo "        env:"
 echo "          DOCKER_COMPOSE_VERSION: \"false\""
@@ -134,7 +148,7 @@ echo "          image: \"${LINUX_AGENT_IMAGE}\""
 echo "          cpu: \"8\""
 echo "          memory: \"4G\""
 
-echo "      - label: \":go: Integration test: test-check-update-version\""
+echo "      - label: \":go: Integration test: check-update-version\""
 echo "        command: ./.buildkite/scripts/integration_tests.sh -t test-check-update-version"
 echo "        env:"
 echo "          DEFAULT_VERSION_TAG: v0.80.0"