diff --git a/.travis.yml b/.travis.yml
index ff7cc240f..73159e11f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,28 @@ 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'
+      jdk: oraclejdk10
     - 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:
+    # Oracle JDK is not yet available on Travis CI: https://github.com/travis-ci/travis-ci/issues/9368
+    - env: JDK='Oracle JDK 10'
+    # ErrorProne/javac is not yet working on JDK 11
+    - env: JDK='Oracle JDK 11'
+    - env: JDK='OpenJDK 11'
+
+before_install:
+  - unset _JAVA_OPTIONS
+  - wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh
 
 after_success:
   - .buildscript/deploy_snapshot.sh