diff --git a/.travis.yml b/.travis.yml
index a2c012190..c3c891959 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,30 @@
-language: scala
-scala:
-- 2.11.7
-- 2.10.6
-jdk:
-- oraclejdk7
-- oraclejdk8
+language: java
 install:
-- npm install xmldom
-- npm install xhr2
-script: project/travis.sh "$TRAVIS_SCALA_VERSION" "$TRAVIS_PULL_REQUEST" "$TRAVIS_BRANCH"
-  "$(jdk_switcher home oraclejdk7)"
+  - npm install xmldom
+  - npm install xhr2
+  - curl -L -o ~/sbt https://github.com/paulp/sbt-extras/raw/478a364a2d43d6e1ac4451f8b84cdafe43a2e43f/sbt
+  - chmod +x ~/sbt
+os:
+  - osx
+script:
+  - project/travis.sh "${TRAVIS_SCALA_VERSION:-2.11.7}" "$TRAVIS_PULL_REQUEST" "$TRAVIS_BRANCH" "$PUBLISH"
 # Uncomment once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed
 # after_success:
 #    - bash <(curl -s https://codecov.io/bash)
+matrix:
+  include:
+    - env: TRAVIS_SCALA_VERSION=2.11.7 PUBLISH=1
+      os: linux
+      jdk: openjdk7
+    - env: TRAVIS_SCALA_VERSION=2.10.6
+      os: linux
+      jdk: openjdk7
+    - env: TRAVIS_SCALA_VERSION=2.11.7
+      os: linux
+      jdk: oraclejdk8
+    - env: TRAVIS_SCALA_VERSION=2.10.6
+      os: linux
+      jdk: oraclejdk8
 env:
   global:
   - secure: miHFMwVRD/yjOLy794nOwc2lJTMyL5O0MXABT9ksg5ejQy1FrFVc2YH86Agp80W02/lGLGl0qWCiK1TBcs9q4Apt01nkD1a/0/iuTRm//bdhnu8BbRxFITf+2cyYJVytKPsF585aHldMv1rwZs3TDaTzEEecAEki5r50yyTVo7ycG0lVj9aVWXerKRMIT54Wb8M6nqbyRB1jGWT0ETNU13vOvQznPTUXQG5hsiKnGYRf8T3umOMdOHpV0rvdwYqAIMsikaAFcYCS5P/pLXMtmRHICH9KUG8TV/ST07p1BXtbBg9y1Q+lpnXotXh4ZNoWOp8B6v7fxJ/WlLYTDROWCiHJ4s2V4Di00db/nW4OWrEEBlrh7vJ/npZqyt9V9YeNv6alxi+DCESwusgvD4Cx5c3zh+2X6RB6BYwWHlFnd80rmsLe4R4fFUcc8E/ZR9vUFjP1CsQKqfJ5yfKR6V+n8jK8FjLpoaU9PHPo2H4V3FZM/fCLcxhE37vfaYI7/O7MqE/cdGpZIuz7g3c4toWCgNZJDn8iJCPmrgcbW5zbfDxvWU2K816ycgnUwSQ5dufrJpAbLNrjR1O8EPRkMDDp9bB7/4RVQvfDfP9GGoiHPHHgxGzY0Lf5bm+Bj1mRfB5/SXHd3IjhUCD9q7eD1/ANifEYALC5BJ4TB8RhQUPU8uM=
diff --git a/project/travis.sh b/project/travis.sh
index ae2049176..25fddad7d 100755
--- a/project/travis.sh
+++ b/project/travis.sh
@@ -7,7 +7,7 @@ TRAVIS_PULL_REQUEST="$1"
 shift
 TRAVIS_BRANCH="$1"
 shift
-JDK7_HOME="$1"
+PUBLISH="$1"
 shift
 
 
@@ -15,8 +15,8 @@ function isNotPr() {
   [ "$TRAVIS_PULL_REQUEST" = "false" ]
 }
 
-function isJdk7() {
-  [ "$JAVA_HOME" = "$JDK7_HOME" ]
+function publish() {
+  [ "$PUBLISH" = 1 ]
 }
 
 function isMaster() {
@@ -35,23 +35,23 @@ else
 fi
 
 # Required for ~/.ivy2/local repo tests
-sbt coreJVM/publish-local
+~/sbt coreJVM/publish-local
 
 SBT_COMMANDS="$SBT_COMMANDS test"
 
 # TODO Add coverage once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed
 
 PUSH_GHPAGES=0
-if isNotPr && isJdk7 && isMaster; then
+if isNotPr && publish && isMaster; then
   SBT_COMMANDS="$SBT_COMMANDS coreJVM/publish coreJS/publish files/publish cli/publish"
 fi
 
-if isNotPr && isJdk7 && isMasterOrDevelop; then
+if isNotPr && publish && isMasterOrDevelop; then
   if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.11"; then
     PUSH_GHPAGES=1
   fi
 fi
 
-sbt ++${TRAVIS_SCALA_VERSION} $SBT_COMMANDS
+~/sbt ++${TRAVIS_SCALA_VERSION} $SBT_COMMANDS
 
 [ "$PUSH_GHPAGES" = 0 ] || "$(dirname "$0")/push-gh-pages.sh" "$TRAVIS_SCALA_VERSION"