diff --git a/.github/workflows/aws-main.yml b/.github/workflows/aws-main.yml
index bba98eaa629f3..5857d9a79feb6 100644
--- a/.github/workflows/aws-main.yml
+++ b/.github/workflows/aws-main.yml
@@ -76,7 +76,7 @@ jobs:
       # default "disableCaching" to `false` if it's a push or schedule event
       disableCaching: ${{ inputs.disableCaching == true }}
       # default "disableTestSelection" to `true` if it's a push or schedule event
-      disableTestSelection: ${{ inputs.enableTestSelection != true }}
+      disableTestSelection: ${{ (inputs.enableTestSelection != '' && inputs.enableTestSelection) || github.event_name == 'push' }}
       PYTEST_LOGLEVEL: ${{ inputs.PYTEST_LOGLEVEL }}
     secrets:
       DOCKERHUB_PULL_USERNAME: ${{ secrets.DOCKERHUB_PULL_USERNAME }}