diff --git a/.travis.yml b/.travis.yml
index c47623351b..14286a19e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 language: android
 android:
   components:
+  - tools
+  - platform-tools
+  - tools
   - build-tools-26.0.1
   - android-26
   - extra-android-m2repository
diff --git a/.travis/build.sh b/.travis/build.sh
index 44652530a7..ab5dad7bfb 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
+git fetch --unshallow #required for commit count
+
 if [ -z "$TRAVIS_TAG" ]; then
     ./gradlew clean buildStandardDebug
 
-    git fetch --unshallow #required for commit count
     COMMIT_COUNT=$(git rev-list --count HEAD)
     export ARTIFACT="tachiyomi-r${COMMIT_COUNT}.apk"