diff --git a/.drone.yml b/.drone.yml
index fc19a0ce5a..1a0b70201c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -110,9 +110,8 @@ steps:
       - ./gradlew installGplayDebugAndroidTest
       - scripts/wait_for_server.sh "server"
       - ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest && scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-      - ./gradlew combinedTestReport
-      - curl -o codecov.sh https://codecov.io/bash
-      - bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5
+      - scripts/runCombinedTest.sh
+
   - name: notify
     image: drillster/drone-email
     settings:
diff --git a/scripts/runCombinedTest.sh b/scripts/runCombinedTest.sh
new file mode 100755
index 0000000000..fc4213a2ea
--- /dev/null
+++ b/scripts/runCombinedTest.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+./gradlew combinedTestReport
+status=$?
+
+curl -o codecov.sh https://codecov.io/bash
+bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5
+
+exit $status