diff --git a/.travis-setup.sh b/.travis-setup.sh
deleted file mode 100755
index e1657def..00000000
--- a/.travis-setup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "$ANDROID_HOME" ]; then
-    mkdir -p $ANDROID_HOME
-    pushd $HOME/.android
-    wget -q http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
-    tar xf android-sdk_r24.4.1-linux.tgz
-    popd
-fi
-
-if [ ! -d "$ANDROID_NDK_HOME" ]; then
-    mkdir -p $ANDROID_NDK_HOME
-    pushd $HOME/.android
-    wget -q http://dl.google.com/android/repository/android-ndk-r12b-linux-${ARCH}.zip
-    unzip -q android-ndk-r12b-linux-${ARCH}.zip
-    popd
-fi
-
-if [ ! -d "$GOROOT_BOOTSTRAP" ]; then
-    mkdir -p $GOROOT_BOOTSTRAP
-    pushd $HOME/.android
-    wget https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz
-    tar xf go1.6.3.linux-amd64.tar.gz
-    popd
-fi
-
-( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter tools,platform-tools,build-tools-24.0.0,android-24,extra-google-m2repository --no-ui -a
-( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter extra-android-m2repository --no-ui -a
-cp local.properties.travis local.properties
diff --git a/.travis.yml b/.travis.yml
index e6c26094..10e84964 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,16 @@
-language: scala
+language: android
 
 jdk:
   - oraclejdk8
 
-sudo: false
-
-addons:
-    apt:
-        packages:
-            - gcc-multilib
-            - g++-multilib
-            - libstdc++6:i386
-            - libgcc1:i386
-            - zlib1g:i386
-            - libncurses5:i386
+env:
+    global:
+        - NDK_VERSION=r12b
+        - NDK_CCACHE=ccache
+        - GOROOT_BOOTSTRAP=$GOROOT
+        - ANDROID_NDK_HOME=$HOME/.android/android-ndk-${NDK_VERSION}
+        - SBTPATH=$HOME/.sbt
+        - PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
 
 scala:
     - 2.11.8
@@ -24,17 +21,34 @@ before_cache:
 
 cache:
     directories:
-        - $HOME/.ivy2/cache
-        - $HOME/.sbt/boot
+        - $HOME/.ivy2
+        - $HOME/.sbt
+
+android:
+    components:
+        - platform-tools
+        - tools
+        - build-tools-24.0.1
+        - extra-google-m2repository
 
 install:
-    - export NDK_CCACHE=ccache
-    - export ARCH=`uname -m`
-    - export GOROOT_BOOTSTRAP=$HOME/.android/go
-    - export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12b
-    - export ANDROID_HOME=$HOME/.android/android-sdk-linux
-    - export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
-    - ./.travis-setup.sh
+    - >
+      if [ ! -d "$ANDROID_NDK_HOME" ]; then
+          mkdir -p $ANDROID_NDK_HOME;
+          pushd $HOME/.android;
+          export ARCH=`uname -m`;
+          wget -q http://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux-${ARCH}.zip;
+          unzip -q android-ndk-${NDK_VERSION}-linux-${ARCH}.zip;
+          popd;
+      fi
+    - >
+      if [ ! -f "$SBTPATH/sbt" ]; then
+          pushd $SBTPATH;
+          wget -q https://raw.githubusercontent.com/paulp/sbt-extras/master/sbt;
+          chmod a+x sbt;
+          popd;
+      fi
 
 script:
-    - sbt native-build android:package-release
+    - cp local.properties.travis local.properties
+    - $SBTPATH/sbt native-build android:package-release