diff --git a/.circleci/config.yml b/.circleci/config.yml
index a20eb37..2926e9b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,19 +30,19 @@ defaults_gradle: &defaults_gradle
         path: build/reports/
 
 jobs:
-  build_gradle_jdk12:
+  build_gradle_jdk14:
     <<: *defaults
 
     docker:
-      - image: openjdk:12-jdk
+      - image: cimg/openjdk:14.0
 
     <<: *defaults_gradle
 
-  build_gradle_jdk8:
+  build_gradle_jdk9:
     <<: *defaults
 
     docker:
-      - image: circleci/openjdk:8-jdk
+      - image: circleci/openjdk:9
 
     <<: *defaults_gradle
 
@@ -50,6 +50,6 @@ workflows:
   version: 2
   gradle:
         jobs:
-        - build_gradle_jdk8
-        - build_gradle_jdk12
+        - build_gradle_jdk9
+        - build_gradle_jdk14
 
diff --git a/.travis.yml b/.travis.yml
index f8946bd..73393f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,12 @@ env:
   global:
     - CI=true
 
+matrix:
+  include:
+    - jdk: openjdk9
+    - env: JDK='OpenJDK 14'
+      install: . ./install-jdk.sh -F 14 -C
+
 install:
   - git fetch --unshallow --tags
 
@@ -12,15 +18,11 @@ addons:
   sonarcloud:
     organization: "ethauvin-github"
 
-jdk:
-  - oraclejdk8
-  - openjdk12
-
 before_install:
   - chmod +x gradlew
 
 after_success:
   - |
-      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk8 ]; then
+      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk9 ]; then
         ./gradlew sonarqube
       fi