diff --git a/.github/actions/aws-device-farm-run/action.yml b/.github/actions/aws-device-farm-run/action.yml
index fc83b4d1a..049876a61 100644
--- a/.github/actions/aws-device-farm-run/action.yml
+++ b/.github/actions/aws-device-farm-run/action.yml
@@ -89,6 +89,9 @@ runs:
 
             if [[ "$status_app" == "SUCCEEDED" && "$status_test_package" == "SUCCEEDED" ]]; then
               exit 0
+            elif ((max_checks == 0)); then
+              echo "App or test package failed to upload"
+              exit 1
             fi
 
             sleep $sleep_time
diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index 7a82f650f..609909838 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -43,7 +43,7 @@ jobs:
           name: ${{ matrix.test.name }}
           appType: ANDROID_APP
           appFile: ${{ matrix.test.appFile }}
-          testFile: ${{ matrix.test.appFile }}
+          testFile: ${{ matrix.test.testFile }}
           testPackageType: INSTRUMENTATION_TEST_PACKAGE
           testType: INSTRUMENTATION
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}