diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index a0776a214..17d3ac5b3 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -137,6 +137,7 @@ jobs:
           role-duration-seconds: 14400
 
       - name: Run ${{ matrix.test.name }} on AWS Device Farm
+        if: env.run_device_test == 'true'
         run: |
           export name="${{ matrix.test.name }}"
           export appType=ANDROID_APP
@@ -150,6 +151,8 @@ jobs:
           export testSpecArn="${{ matrix.test.testSpecArn }}"
           export wait_for_completion=true
 
+          set +e
+
           run_arn="$(./scripts/aws-device-farm/aws-device-farm-run.sh)"
           exit_status=$?
           echo "run_arn=$run_arn" >> "$GITHUB_ENV"