diff --git a/.travis.yml b/.travis.yml
index 680b92eed..f27c8ac57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,13 +101,11 @@ install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
       if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi
     fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-      jdk_switcher use openjdk7;
-    fi
   - if [ "$BUILD_TYPE" == "PSP" ]; then
       tar -x --xz -f sdk.lzma;
     fi
-  - if [ "$BUILD_TYPE" == "ANDROID" ]; then
+  - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" == "ANDROID" ]; then
+      jdk_switcher use openjdk7 %%
       tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
       export ANDROID_NDK=`pwd`/android-ndk-r9 &&
       unzip 4e9e88c03f04.zip &&
@@ -119,10 +117,11 @@ install:
       sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant;
     fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" != "ANDROID" ]; then
+      jdk_switcher use openjdk7 &&
       pip install cpp-coveralls &&
+      sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant &&
       pip install pyjavaproperties &&
-      pip install github3.py &&
-      sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant;
+      pip install github3.py;
     fi
 
 env: