diff --git a/.circleci/config.yml b/.circleci/config.yml
index f5464932933..fd96631fee2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,15 +5,21 @@ jobs:
     environment:
       JAVA_TOOL_OPTIONS: -Xms512m -Xmx2g
     docker:
-      - image: circleci/openjdk:8u171-jdk
+      - image: adoptopenjdk/openjdk8:jdk8u202-b08
     steps:
       - checkout
-      - run: mvn test
+      - restore_cache:
+          key: dropwizard-{{ checksum "pom.xml" }}
+      - run: ./mvnw -B install
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: dropwizard-{{ checksum "pom.xml" }}
       - run:
           name: Save test results
           command: |
             mkdir -p ~/junit/
-            find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/junit/ \;
+            mv ~/dropwizard/*/target/surefire-reports/*.xml ~/junit/
           when: always
       - store_test_results:
           path: ~/junit