diff --git a/.circleci/config.yml b/.circleci/config.yml
index 763b2f7..5623d1c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,27 +2,16 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.13
-
-    working_directory: /go/src/github.com/alecthomas/kong
+      - image: cimg/base:2021.04
     steps:
       - checkout
       - run:
-          name: Prepare
+          name: Test
           command: |
-            go get -v github.com/jstemmer/go-junit-report
-            go get -v -t -d ./...
-            curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s v1.23.7
-            mkdir ~/report
-          when: always
+            . ./bin/activate-hermit
+            go test -v ./...
       - run:
           name: Lint
           command: |
-            ./bin/golangci-lint run
-      - run:
-          name: Test
-          command: |
-            go test -v ./... 2>&1 | tee report.txt && go-junit-report < report.txt > ~/report/junit.xml
-      - store_test_results:
-          path: ~/report
-
+            . ./bin/activate-hermit
+            golangci-lint run