diff --git a/.circleci/config.yml b/.circleci/config.yml
index 807b796ae5..e80ce63985 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -75,7 +75,7 @@ commands:
           template: basic_fail_1
 
 jobs:
-  test:
+  lint:
     machine:
       image: ubuntu-1604:202104-01
     resource_class: medium
@@ -117,9 +117,6 @@ jobs:
                 min_instances: 1
                 max_instances: 1
             EOF
-      - run:
-          name: Lint
-          command: make lint
       - run:
           name: Go Tests
           command: make test
@@ -246,10 +243,12 @@ jobs:
 workflows:
   build:
     jobs:
+      - lint
       - test
       - build-and-deploy-approval:
           type: approval
           requires:
+            - lint
             - test
           filters:
             branches:
@@ -257,6 +256,7 @@ workflows:
                 - /^[0-9]+\.[0-9]+$/
       - build-and-upload-cli:
           requires:
+            - lint
             - test
             - build-and-deploy-approval
           filters: