diff --git a/.buildkite/pipeline.trigger.integration.tests.sh b/.buildkite/pipeline.trigger.integration.tests.sh
index 5f52fe7df..2c0f267bb 100755
--- a/.buildkite/pipeline.trigger.integration.tests.sh
+++ b/.buildkite/pipeline.trigger.integration.tests.sh
@@ -36,13 +36,8 @@ CHECK_PACKAGES_TESTS=(
     test-check-packages-benchmarks
 )
 for test in ${CHECK_PACKAGES_TESTS[@]}; do
-    options=""
-    if [ "${test}" == "test-check-packages-benchmarks" ]; then
-        package_name=$(basename ${package})
-        options="-p ${package_name}"
-    fi
     echo "      - label: \":go: Running integration test: ${test}\""
-    echo "        command: ./.buildkite/scripts/integration_tests.sh -t ${test} ${options}"
+    echo "        command: ./.buildkite/scripts/integration_tests.sh -t ${test}"
     echo "        agents:"
     echo "          provider: \"gcp\""
     echo "        artifact_paths:"
diff --git a/scripts/test-check-packages.sh b/scripts/test-check-packages.sh
index 2978bf213..c62c8593d 100755
--- a/scripts/test-check-packages.sh
+++ b/scripts/test-check-packages.sh
@@ -69,21 +69,23 @@ for d in test/packages/${PACKAGE_TEST_TYPE:-other}/${PACKAGE_UNDER_TEST:-*}/; do
     elastic-package install -v
 
     if [ "${PACKAGE_TEST_TYPE:-other}" == "benchmarks" ]; then
-      if [ "${PACKAGE_UNDER_TEST:-*}" == "pipeline_benchmark" ]; then
+      # It is not used PACKAGE_UNDER_TEST, so all benchmark packages are run in the same loop
+      package_to_test=$(basename ${d})
+      if [ "${package_to_test}" == "pipeline_benchmark" ]; then
         rm -rf "${OLDPWD}/build/benchmark-results"
         elastic-package benchmark pipeline -v --report-format xUnit --report-output file --fail-on-missing
-        
+
         rm -rf "${OLDPWD}/build/benchmark-results-old"
         mv "${OLDPWD}/build/benchmark-results" "${OLDPWD}/build/benchmark-results-old"
-        
+
         elastic-package benchmark pipeline -v --report-format json --report-output file --fail-on-missing
-        
+
         elastic-package report --fail-on-missing benchmark \
           --new ${OLDPWD}/build/benchmark-results \
           --old ${OLDPWD}/build/benchmark-results-old \
           --threshold 1 --report-output-path="${OLDPWD}/build/benchreport"
       fi
-      if [ "${PACKAGE_UNDER_TEST:-*}" == "system_benchmark" ]; then
+      if [ "${package_to_test}" == "system_benchmark" ]; then
         elastic-package benchmark system --benchmark logs-benchmark -v --defer-cleanup 1s
       fi
     else