diff --git a/.travis.yml b/.travis.yml
index 0070d628..a72358f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ cache:
         - $HOME/.ivy2/cache
         - $HOME/.sbt/boot
 
-before_install:
+install:
     - ./travis-ci/setup.sh
     - export NDK_CCACHE=ccache
     - export ARCH=`uname -m`
@@ -36,5 +36,9 @@ before_install:
     - export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
     - cp local.properties.travis local.properties
 
+before_script:
+    - echo $JAVA_OPTS
+    - export JAVA_OPTS="-Xmx2048m $JAVA_OPTS"
+
 script:
     - sbt native-build android:package-release
diff --git a/travis-ci/setup.sh b/travis-ci/setup.sh
index 451a7830..c0d935f5 100755
--- a/travis-ci/setup.sh
+++ b/travis-ci/setup.sh
@@ -22,5 +22,5 @@ if [ ! -d "$ANDROID_NDK_HOME" ]; then
     popd
 fi
 
-( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter tools,platform-tools,build-tools-23.0.2,android-23,extra-google-m2repository --no-ui -a
+( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter tools,platform-tools,build-tools-24.0.0,android-23,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