diff --git a/.travis.yml b/.travis.yml
index f68f3e629..a7c87f118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,28 +10,42 @@ script:
 #    - bash <(curl -s https://codecov.io/bash)
 matrix:
   include:
-    - env: TRAVIS_SCALA_VERSION=2.12.1 PUBLISH=1
+    - env: SCALA_VERSION=2.12.1 PUBLISH=1
       os: linux
       jdk: oraclejdk8
-    - env: TRAVIS_SCALA_VERSION=2.11.11 PUBLISH=1
+    - env: SCALA_VERSION=2.11.11 PUBLISH=1
       os: linux
       jdk: oraclejdk8
       sudo: required
       services:
         - docker
-    - env: TRAVIS_SCALA_VERSION=2.10.6 PUBLISH=1
+    - env: SCALA_VERSION=2.10.6 PUBLISH=1
       os: linux
       jdk: oraclejdk8
       sudo: required
       services:
         - docker
-    - env: TRAVIS_SCALA_VERSION=2.12.1 PUBLISH=1 SCALA_JS=1
+    - env: SCALA_VERSION=2.12.1 SBT_COURSIER=1
       os: linux
       jdk: oraclejdk8
-    - env: TRAVIS_SCALA_VERSION=2.11.11 PUBLISH=1 SCALA_JS=1
+    - env: SCALA_VERSION=2.12.1 SBT_SHADING=1
       os: linux
       jdk: oraclejdk8
-    - env: TRAVIS_SCALA_VERSION=2.10.6 PUBLISH=1 SCALA_JS=1
+    - env: SCALA_VERSION=2.10.6 SBT_COURSIER=1
+      os: linux
+      jdk: oraclejdk8
+      services:
+        - docker
+    - env: SCALA_VERSION=2.10.6 SBT_SHADING=1
+      os: linux
+      jdk: oraclejdk8
+    - env: SCALA_VERSION=2.12.1 SCALA_JS=1
+      os: linux
+      jdk: oraclejdk8
+    - env: SCALA_VERSION=2.11.11 SCALA_JS=1
+      os: linux
+      jdk: oraclejdk8
+    - env: SCALA_VERSION=2.10.6 SCALA_JS=1
       os: linux
       jdk: oraclejdk8
 env:
diff --git a/scripts/push-gh-pages.sh b/scripts/push-gh-pages.sh
index de7b56857..9c04f832b 100755
--- a/scripts/push-gh-pages.sh
+++ b/scripts/push-gh-pages.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 set -ev
 
-TRAVIS_SCALA_VERSION="$1"
+SCALA_VERSION="$1"
 shift
 
-sbt ++${TRAVIS_SCALA_VERSION} web/fastOptJS
+sbt ++${SCALA_VERSION} web/fastOptJS
 
 HELPER="$(readlink -f "$(dirname "$0")/push-gh-pages-helper.sh")"
 
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 0917c2de7..6f35903b5 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -54,6 +54,14 @@ isScalaJs() {
   [ "$SCALA_JS" = 1 ]
 }
 
+sbtCoursier() {
+  [ "$SBT_COURSIER" = 1 ]
+}
+
+sbtShading() {
+  [ "$SBT_SHADING" = 1 ]
+}
+
 is210() {
   echo "$SCALA_VERSION" | grep -q "^2\.10"
 }
@@ -182,27 +190,33 @@ if isScalaJs; then
 else
   integrationTestsRequirements
   jvmCompile
-  runJvmTests
 
-  if is210 || is212; then
-    runSbtCoursierTests
-    runSbtShadingTests
+  if sbtCoursier; then
+    if is210 || is212; then
+      runSbtCoursierTests
+    fi
+
+    if is210; then
+      testSbtCoursierJava6
+    fi
+  elif sbtShading; then
+    if is210 || is212; then
+      runSbtShadingTests
+    fi
+  else
+    runJvmTests
+
+    validateReadme
+    checkBinaryCompatibility
+
+    if is211; then
+      testLauncherJava6
+    fi
   fi
 
-  validateReadme
-  checkBinaryCompatibility
-
-  # We're not using a jdk6 matrix entry with Travis here as some sources of coursier require Java 7 to compile
+  # Not using a jdk6 matrix entry with Travis as some sources of coursier require Java 7 to compile
   # (even though it won't try to call Java 7 specific methods if it detects it runs under Java 6).
   # The tests here check that coursier is nonetheless fine when run under Java 6.
-
-  if is211; then
-    testLauncherJava6
-  fi
-
-  if is210; then
-    testSbtCoursierJava6
-  fi
 fi