diff --git a/.travis.yml b/.travis.yml
index cd16fa5e8246..0ec50169b353 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,10 +14,6 @@ services:
 branches:
   only:
   - master
-# Enable once Travis CI fixed JDK setup
-#jdk:
-  #- oraclejdk11
-  #- oraclejdk10
 before_cache:
 - rm -rf $HOME/.gradle/caches/4.*/
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -27,7 +23,7 @@ before_script:
  - unset -v _JAVA_OPTIONS
  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
  - chmod +x install-jdk.sh
- - export JAVA_HOME=$(./install-jdk.sh --emit-java-home -F 10 -c | tail --lines 1)
+ - export JAVA_HOME=$(./install-jdk.sh --emit-java-home -F 11 -c | tail --lines 1)
  - echo $JAVA_HOME
 cache:
   bundler: false
diff --git a/ci/tests/run-tests-simple.sh b/ci/tests/run-tests-simple.sh
index 398634f8556b..523fa770e02c 100755
--- a/ci/tests/run-tests-simple.sh
+++ b/ci/tests/run-tests-simple.sh
@@ -3,7 +3,7 @@
 prepCommand="echo 'Running command...'; "
 gradle="./gradlew $@"
 gradleBuild=""
-gradleBuildOptions="--stacktrace --build-cache --configure-on-demand --no-daemon -DtestCategoryType=SIMPLE --scan "
+gradleBuildOptions="--stacktrace --build-cache --configure-on-demand --no-daemon -DtestCategoryType=SIMPLE "
 
 echo -e "***********************************************"
 echo -e "Gradle build started at `date`"
@@ -14,7 +14,7 @@ gradleBuild="$gradleBuild test jacocoRootReport --parallel -x javadoc -x check \
     -DskipNodeModulesCleanUp=true -DskipNpmCache=true -DskipNestedConfigMetadataGen=true "
 
 if [[ "${TRAVIS_COMMIT_MESSAGE}" == *"[show streams]"* ]]; then
-    gradleBuild="$gradleBuild -DshowStandardStreams=true "
+   gradleBuild="$gradleBuild -DshowStandardStreams=true "
 fi
 
 if [[ "${TRAVIS_COMMIT_MESSAGE}" == *"[rerun tasks]"* ]]; then