diff --git a/.travis.yml b/.travis.yml
index 81a470aba..da7a7fd91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,26 +99,11 @@ matrix:
       script:
         - true  # we still need this block to exist, otherwise it will fall back to the global one
 
-    # Build Linux wheels and multi-platform jars.
-    - os: linux
-      env:
-        - LINUX_WHEELS=1 LINUX_JARS=1
-        - PYTHONWARNINGS=ignore
-        - RAY_INSTALL_JAVA=1
-      install:
-        - . ./ci/travis/ci.sh init RAY_CI_LINUX_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED
-      before_script:
-        - . ./ci/travis/ci.sh build
-      script:
-        - . ./ci/travis/ci.sh test_wheels
-        - bash ./java/build-jar-multiplatform.sh linux
-      cache: false
-
     # Build MacOS wheels and MacOS jars
     - os: osx
       osx_image: xcode7
       env:
-        - MAC_WHEELS=1 MULTIPLATFORM_JARS=1
+        - MAC_WHEELS=1 MAC_JARS=1
         - PYTHONWARNINGS=ignore
         - RAY_INSTALL_JAVA=1
       install:
@@ -128,8 +113,23 @@ matrix:
       script:
         - . ./ci/travis/ci.sh test_wheels
         - bash ./java/build-jar-multiplatform.sh darwin
+
+    # Build Linux wheels and multi-platform jars.
+    - os: linux
+      env:
+        - LINUX_WHEELS=1 MULTIPLATFORM_JARS=1
+        - PYTHONWARNINGS=ignore
+        - RAY_INSTALL_JAVA=1
+      install:
+        - . ./ci/travis/ci.sh init RAY_CI_LINUX_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED
+      before_script:
+        - . ./ci/travis/ci.sh build
+      script:
+        - . ./ci/travis/ci.sh test_wheels
+        - bash ./java/build-jar-multiplatform.sh linux
         - bash ./java/build-jar-multiplatform.sh multiplatform
         #- bash ./java/build-jar-multiplatform.sh deploy
+      cache: false
 
     # RLlib: Learning tests (from rllib/tuned_examples/*.yaml).
     - os: linux
@@ -411,7 +411,7 @@ deploy:
     on:
       repo: ray-project/ray
       all_branches: true
-      condition: $MULTIPLATFORM_JARS = 1 || $LINUX_JARS=1
+      condition: $MULTIPLATFORM_JARS = 1 || $MAC_JARS=1
 
   - provider: s3
     edge: true # This supposedly opts in to deploy v2.
@@ -427,7 +427,7 @@ deploy:
     on:
       repo: ray-project/ray
       branch: master
-      condition: $MULTIPLATFORM_JARS = 1 || $LINUX_JARS=1
+      condition: $MULTIPLATFORM_JARS = 1 || $MAC_JARS=1
 
   - provider: script
     edge: true # This supposedly opts in to deploy v2.
diff --git a/java/build-jar-multiplatform.sh b/java/build-jar-multiplatform.sh
index 08606ee7e..e21eb0a98 100755
--- a/java/build-jar-multiplatform.sh
+++ b/java/build-jar-multiplatform.sh
@@ -78,14 +78,14 @@ build_jars_multiplatform() {
   build_jars multiplatform false
 }
 
-# Download linux/windows ray-related jar from s3
-# This function assumes darwin jars exist already.
+# Download darwin/windows ray-related jar from s3
+# This function assumes linux jars exist already.
 download_jars() {
   local wait_time=0
   local sleep_time_units=60
 
   for f in "$@"; do
-    for os in 'linux' 'windows'; do
+    for os in 'darwin' 'windows'; do
       if [[ "$os" == "windows" ]]; then
         break
       fi