diff --git a/.travis.yml b/.travis.yml
index 11566ed01..688e53d2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,14 @@
 language: java
+jdk: oraclejdk7
 
 notifications:
   email: false
 
 before_install:
-  - wget http://dl.google.com/android/android-sdk_r21-linux.tgz
-  - tar -zxf android-sdk_r21-linux.tgz
-  - export ANDROID_HOME=~/builds/github/android/android-sdk-linux
-  - export PATH=${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
-  - android update sdk --filter platform-tools,android-16 --no-ui --force
\ No newline at end of file
+  - sudo apt-get update -qq
+  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
+  - wget http://dl.google.com/android/android-sdk_r21.1-linux.tgz
+  - tar -zxf android-sdk_r21.1-linux.tgz
+  - export ANDROID_HOME=$PWD/android-sdk-linux
+  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+  - android update sdk --filter platform-tools,android-16 --no-ui --force > /dev/null