diff --git a/.buildkite/commands/run-instrumented-tests.sh b/.buildkite/commands/run-instrumented-tests.sh
index 03cbfd7e2827..5fbfcee9e313 100755
--- a/.buildkite/commands/run-instrumented-tests.sh
+++ b/.buildkite/commands/run-instrumented-tests.sh
@@ -19,7 +19,7 @@ if [[ "$TESTS_EXIT_STATUS" -ne 0 ]]; then
 fi
 
 echo "--- 🚦 Report Tests Status"
-results_file=$(find "build/instrumented-tests" -type f -name "*.xml" -print -quit)
+results_file=$(find "../../build/instrumented-tests" -type f -name "*.xml" -print -quit)
 
 if [[ $BUILDKITE_BRANCH == trunk ]] || [[ $BUILDKITE_BRANCH == release/* ]]; then
     annotate_test_failures "$results_file" --slack "build-and-ship"
diff --git a/fastlane/lanes/test.rb b/fastlane/lanes/test.rb
index f4497b94787e..9dcd94185257 100644
--- a/fastlane/lanes/test.rb
+++ b/fastlane/lanes/test.rb
@@ -23,7 +23,7 @@
       sh("buildkite-agent annotation remove --context '#{annotation_ctx}' || true") if is_ci?
     rescue
       details_url = sh('jq ".[].webLink" ../build/instrumented-tests/matrix_ids.json -r')
-      message = "Firebase Tests failed. Failure details can be seen [here in Firebase Console](#{details_url})"
+      message = "#{app} Firebase Tests failed. Failure details can be seen [here in Firebase Console](#{details_url})"
       sh('buildkite-agent', 'annotate', message, '--style', 'error', '--context', annotation_ctx) if is_ci?
       UI.test_failure!(message)
     end