diff --git a/.buildscript/install-jdk.sh b/.buildscript/install-jdk.sh
deleted file mode 100644
index 481d4872d..000000000
--- a/.buildscript/install-jdk.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# Install JDK from "download.java.net"
-#
-# Adapted from https://github.com/sormuras/bach/blob/master/install-jdk.sh
-#
-
-set -e
-
-JDK_FEATURE='10'
-
-TMP=$(curl -L jdk.java.net/${JDK_FEATURE})
-TMP="${TMP#*Most recent build: jdk-${JDK_FEATURE}+}"    # remove everything before the number
-TMP="${TMP%%<*}"                                        # remove everything after the number
-JDK_BUILD="$(echo -e "${TMP}" | tr -d '[:space:]')"     # remove all whitespace
-
-JDK_LICENSE='GPL'
-
-while getopts F:B:L: option
-do
- case "${option}"
- in
- F) JDK_FEATURE=${OPTARG};;
- B) JDK_BUILD=${OPTARG};;
- L) JDK_LICENSE=${OPTARG};;
- esac
-done
-
-JDK_BASENAME='jdk'
-if [ "${JDK_LICENSE}" == 'GPL' ]; then
-  JDK_BASENAME='openjdk'
-fi
-
-JDK_ARCHIVE=${JDK_BASENAME}-${JDK_FEATURE}+${JDK_BUILD}_linux-x64_bin.tar.gz
-
-cd ~
-wget http://download.java.net/java/jdk${JDK_FEATURE}/archive/${JDK_BUILD}/${JDK_LICENSE}/${JDK_ARCHIVE}
-tar -xzf ${JDK_ARCHIVE}
-export JAVA_HOME=~/jdk-${JDK_FEATURE}
-export PATH=${JAVA_HOME}/bin:$PATH
-cd -
-
-java --version
diff --git a/.travis.yml b/.travis.yml
index ff7cc240f..4e0a881b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,27 @@ language: java
 
 matrix:
   include:
-    - env: JDK='OracleJDK 8'
+    - env: JDK='Oracle JDK 8'
       jdk: oraclejdk8
-    - env: JDK='OracleJDK 9'
+    - env: JDK='Oracle JDK 9'
       jdk: oraclejdk9
-    - env: JDK='OracleJDK 10'
-      install: . ./.buildscript/install-jdk.sh -F 10 -L BCL
+    - env: JDK='Oracle JDK 10'
+      install: . ./install-jdk.sh -F 10 -L BCL
     - env: JDK='OpenJDK 10'
-      install: . ./.buildscript/install-jdk.sh -F 10 -L GPL
+      install: . ./install-jdk.sh -F 10 -L GPL
+    - env: JDK='Oracle JDK 11'
+      install: . ./install-jdk.sh -F 11 -L BCL
+    - env: JDK='OpenJDK 11'
+      install: . ./install-jdk.sh -F 11 -L GPL
+  allow_failures:
+    # ErrorProne/javac is not yet working on JDK 11
+    - env: JDK='Oracle JDK 11'
+    - env: JDK='OpenJDK 11'
+
+# Direct usage of `install-jdk.sh` might be superseded by https://github.com/travis-ci/travis-build/pull/1347
+before_install:
+  - unset _JAVA_OPTIONS
+  - wget https://github.com/sormuras/bach/raw/1.0.1/install-jdk.sh
 
 after_success:
   - .buildscript/deploy_snapshot.sh