diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32bc18d..fb52613 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,30 +1,40 @@
-version: 2
+defaults: &defaults
+  working_directory: ~/code
+  environment:
+    JVM_OPTS: -Xmx3200m
+    TERM: dumb
+    CI: true
+
+defaults_gradle: &defaults_gradle
+  steps:
+    - checkout
+    - restore_cache:
+        keys: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+    - run:
+        name: Setup Google Services
+        command: echo $GOOGLE_SERVICES | base64 -di > app/google-services.json
+    - run:
+        name: Download Dependencies
+        command: ./gradlew androidDependencies
+    - save_cache:
+        paths: ~/.gradle
+        key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+    - run:
+        name: Run Tests
+        command: ./gradlew link test
+    - store_artifacts:
+        path: app/build/reports
+        destination: reports
+    - store_test_results:
+        path: app/build/test-results
+
+version: 2.0
+
 jobs:
-  build:
-    working_directory: ~/code
+  build_gradle:
+    <<: *defaults
+
     docker:
       - image: circleci/android:api-28
-    environment:
-      JVM_OPTS: -Xmx3200m
-    steps:
-      - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run:
-          name: Download Dependencies
-          command: ./gradlew androidDependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run:
-          name: Setup Google Services
-          command: echo $GOOGLE_SERVICES | base64 -di > app/google-services.json
-      - run:
-          name: Run Tests
-          command: ./gradlew lint test
-      - store_artifacts:
-          path: app/build/reports
-          destination: reports
-      - store_test_results:
-          path: app/build/test-results
+
+    <<: *defaults_gradle