diff --git a/contrib/instrumentation.sh b/contrib/instrumentation.sh
index 03db54ff3..3812b7612 100644
--- a/contrib/instrumentation.sh
+++ b/contrib/instrumentation.sh
@@ -2,6 +2,9 @@
 
 adb logcat -c
 adb logcat *:E -v color &
-./gradlew jacocoInstrumentationTestReport; gradlew_return_code=$?
-adb exec-out screencap -p > screencap.png
-gradlew_return_code
+if ./gradlew jacocoInstrumentationTestReport; then
+  echo "jacocoInstrumentationTestReport succeeded" >&2
+else
+  adb exec-out screencap -p >screencap.png
+  echo "jacocoInstrumentationTestReport failed" >&2
+fi
diff --git a/contrib/instrumentation_nightly.sh b/contrib/instrumentation_nightly.sh
index 66c4cbbc6..8b2552f00 100644
--- a/contrib/instrumentation_nightly.sh
+++ b/contrib/instrumentation_nightly.sh
@@ -2,6 +2,9 @@
 
 adb logcat -c
 adb logcat *:E -v color &
-./gradlew connectedDebugAndroidTest; gradlew_return_code=$?
-adb exec-out screencap -p >screencap.png
-gradlew_return_code
+if ./gradlew connectedDebugAndroidTest; then
+  echo "connectedDebugAndroidTest succeeded" >&2
+else
+  adb exec-out screencap -p >screencap.png
+  echo "connectedDebugAndroidTest failed" >&2
+fi