diff --git a/.circleci/config.yml b/.circleci/config.yml
index e0631a861..2d42513c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,25 +42,6 @@ aliases:
     docker:
       - image: circleci/node:10-browsers
     working_directory: ~/repo
-  - &setup_steps
-      - *restore_git_cache
-      - checkout
-      - run: npm ci
-  - &test_steps
-    - run:
-        name: Lint
-        command: npm run test:lint -- --quiet --output-file test-results/eslint-results.xml --format junit
-    - run:
-        name: Unit
-        environment:
-          JEST_JUNIT_OUTPUT_NAME: unit-results.xml
-        command: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov --maxWorkers="2"
-    - store_artifacts:
-        path: coverage
-  - &build_steps
-      - run:
-          name: Build
-          command: npm run build
 
 jobs:
   build-test-no-cache:
@@ -70,9 +51,24 @@ jobs:
       NODE_ENV: production
       NODE_OPTIONS: --max-old-space-size=4000
     steps:
-      - *setup_steps
-      - *test_steps
-      - *build_steps
+      - *restore_git_cache
+      - checkout
+      - run: npm ci
+      - run:
+          name: Lint
+          command: npm run test:lint -- --quiet --output-file test-results/eslint-results.xml --format junit
+      - run:
+          name: Unit
+          environment:
+            JEST_JUNIT_OUTPUT_NAME: unit-results.xml
+          command: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov --maxWorkers="2"
+      - run:
+          name: Build
+          command: npm run build
+      - store_artifacts:
+          path: coverage
+      - store_test_results:
+          path: test-results
   setup:
     <<: *defaults
     steps: