diff --git a/.circleci/config.yml b/.circleci/config.yml
index d455fe1..fd2e41d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,41 +4,55 @@ defaults: &defaults
     JVM_OPTS: -Xmx3200m
     TERM: dumb
 
+defaults_gradle: &defaults_gradle
+  steps:
+    - checkout
+    - restore_cache:
+        keys:
+          - gradle-dependencies-{{ checksum "build.gradle" }}
+          # fallback to using the latest cache if no exact match is found
+          - gradle-dependencies-
+    - run:
+        name: Gradle Dependencies
+        command: ./gradlew dependencies
+    - save_cache:
+        paths: ~/.m2
+        key: gradle-dependencies-{{ checksum "build.gradle" }}
+    - run:
+        name: Run All Checks
+        command: ./gradlew check
+    - store_artifacts:
+        path: build/reports/
+        destination: reports
+    - store_test_results:
+        path: build/reports/
+
 version: 2.0
 
 jobs:
+  build_gradle_jdk10:
+    <<: *defaults
 
-  build_gradle:
+    docker:
+      - image: circleci/openjdk:10-jdk
+
+    <<: *defaults_gradle
+
+  build_gradle_jdk9:
+    <<: *defaults
+
+    docker:
+      - image: circleci/openjdk:9-jdk
+
+    <<: *defaults_gradle
+
+  build_gradle_jdk8:
     <<: *defaults
 
     docker:
       - image: circleci/openjdk:8-jdk
 
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - gradle-dependencies-{{ checksum "build.gradle" }}
-          # fallback to using the latest cache if no exact match is found
-          - gradle-dependencies-
-
-      - run:
-          name: Gradle Dependencies
-          command: ./gradlew dependencies
-
-      - save_cache:
-          paths: ~/.m2
-          key: gradle-dependencies-{{ checksum "build.gradle" }}
-
-      - run:
-          name: Run All Checks
-          command: ./gradlew check
-
-      - store_artifacts:
-          path: build/reports/
-          destination: reports
-      - store_test_results:
-          path: build/reports/
+    <<: *defaults_gradle
 
   build_kobalt:
     <<: *defaults
@@ -72,44 +86,13 @@ jobs:
       - store_test_results:
           path: kobaltBuild/test-output/
 
-  build_gradle_jdk9:
-    <<: *defaults
-
-    docker:
-      - image: circleci/openjdk:9-jdk
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - gradle-dependencies-{{ checksum "build.gradle" }}
-          # fallback to using the latest cache if no exact match is found
-          - gradle-dependencies-
-
-      - run:
-          name: Gradle Dependencies
-          command: ./gradlew dependencies
-
-      - save_cache:
-          paths: ~/.m2
-          key: gradle-dependencies-{{ checksum "build.gradle" }}
-
-      - run:
-          name: Run All Checks
-          command: ./gradlew check
-
-      - store_artifacts:
-          path: build/reports/
-          destination: reports
-      - store_test_results:
-          path: build/reports/
-
 workflows:
   version: 2
   gradle:
-    jobs:
-      - build_gradle
-      - build_gradle_jdk9
+        jobs:
+        - build_gradle
+        - build_gradle_jdk9
+        - build_gradle_jdk10
   kobalt:
-    jobs:
-      - build_kobalt
\ No newline at end of file
+        jobs:
+        - build_kobalt
diff --git a/.travis.yml b/.travis.yml
index d106d01..80eea46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: java
 jdk:
   - oraclejdk8
   - oraclejdk9
+  - oraclejdk10
 
 before_install:
-  - chmod +x gradlew
\ No newline at end of file
+  - chmod +x gradlew