diff --git a/.github/workflows/presubmit-bun.yml b/.github/workflows/presubmit-bun.yml
index 3543f8f6ab57..7d27d2b1df97 100644
--- a/.github/workflows/presubmit-bun.yml
+++ b/.github/workflows/presubmit-bun.yml
@@ -75,7 +75,7 @@ jobs:
           RUN_TESTS_MODE: RUN_UNIT_TESTS
           BUILD_TYPE: presubmit
           TEST_TYPE: units
-          TEST_CMD: bun run
+          TEST_CMD: bun --bun run
           SHARD_TOTAL: ${{ needs.setup.outputs.shard-total }}
           SHARD_INDEX: ${{ matrix.shard-index }}
           GIT_DIFF_ARG: HEAD^1
diff --git a/ci/run_conditional_tests.sh b/ci/run_conditional_tests.sh
index 36e00d66c0f3..4b76c3f0deff 100755
--- a/ci/run_conditional_tests.sh
+++ b/ci/run_conditional_tests.sh
@@ -220,9 +220,12 @@ for subdir in ${subdirs[@]}; do
                         echo "run samples tests for core/packages in ${d}"
                         should_test=true
                     fi
+                elif [[ "${TEST_TYPE}" == "lint" ]] || [[ "${TEST_TYPE}" == "units" ]]; then
+                    echo "change detected in ${d} for ${TEST_TYPE} test"
+                    should_test=true
                 elif [[ "${d}" == core/packages/* ]] || [[ "${d}" == core/dev-packages/* ]]; then
                     echo "skipping core package ${d} in non-core trigger"
-                elif [[ "${TEST_TYPE}" == "system" ]] || [[ "${TEST_TYPE}" == "lint" ]] || [[ "${TEST_TYPE}" == "units" ]]; then
+                elif [[ "${TEST_TYPE}" == "system" ]]; then
                     echo "change detected in ${d} for ${TEST_TYPE} test"
                     should_test=true
                 elif [[ "${tests_with_credentials[*]}" =~ "${d}" ]] && [[ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then