diff --git a/.circleci/config.yml b/.circleci/config.yml
index de122ca2ea63b..be65f04b6f09b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -175,20 +175,6 @@ jobs:
           #SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo".
           command: shellcheck --severity=info -e SC2059 -e SC2028 --shell=bash ./cmd/**/*.sh ./omnibus/package-scripts/*/*
 
-  python_linting:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: setting env vars for click
-          command: |
-            echo 'export LC_ALL="C.UTF-8"' >> $BASH_ENV
-            echo 'export LANG="C.UTF-8"' >> $BASH_ENV
-      - run:
-          name: lint python files
-          command: inv -e linter.python
-
   component_linting:
     <<: *job_template
     steps:
@@ -283,9 +269,6 @@ workflows:
       - shell_linting:
           requires:
             - dependencies
-      - python_linting:
-          requires:
-            - dependencies
       - component_linting:
           requires:
             - dependencies
diff --git a/.gitlab/source_test/linux.yml b/.gitlab/source_test/linux.yml
index 561eb1a201077..169f0f98e5a29 100644
--- a/.gitlab/source_test/linux.yml
+++ b/.gitlab/source_test/linux.yml
@@ -148,6 +148,14 @@ lint_flavor_heroku_linux-x64:
   variables:
     FLAVORS: '--flavors heroku'
 
+lint_python:
+  stage: source_test
+  image: gcr.io/datadoghq/agent-circleci-runner:v31988376-bfbb3afb
+  tags: ["arch:amd64"]
+  needs: []
+  script:
+    - inv -e linter.python
+
 # Exclude systemd because it cannot succeed on Centos 6: the image doesn't have the shared object required by
 # https://github.com/coreos/go-systemd/blob/c8cc474ba8655dfbdb0ac7fcc09b7faf5b643caf/sdjournal/functions.go#L46
 # This is OK because the test on systemd still runs on the debian image above