diff --git a/travis-ci/setup.sh b/travis-ci/setup.sh
index 5f223a95..3f945489 100755
--- a/travis-ci/setup.sh
+++ b/travis-ci/setup.sh
@@ -6,12 +6,6 @@ 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}
 
-if [ ! -d "$GOROOT_BOOTSTRAP" ]; then
-    wget https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz
-    tar xvf go1.6.3.linux-amd64.tar.gz
-    mv go $GOROOT_BOOTSTRAP
-fi
-
 if [ ! -d "$ANDROID_HOME" ]; then
     mkdir -p $ANDROID_HOME
     pushd $HOME/.android
@@ -28,5 +22,13 @@ if [ ! -d "$ANDROID_NDK_HOME" ]; then
     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 xvf 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-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