diff --git a/.codeclimate.yml b/.codeclimate.yml
index 081fb92ef27..42afed54371 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -38,3 +38,10 @@ exclude_paths:
 - .yarn-cache/
 - tmp/
 - builds/
+- coverage/
+- public/
+- shared/
+- webpack-report/
+- log/
+- backups/
+- coverage-javascript/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26fa9e9fd87..c6868931657 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -456,6 +456,21 @@ karma:
     paths:
     - coverage-javascript/
 
+codeclimate:
+  before_script: []
+  image: docker:latest
+  stage: test
+  variables:
+    SETUP_DB: "false"
+    DOCKER_DRIVER: overlay
+  services:
+    - docker:dind
+  script:
+    - docker pull codeclimate/codeclimate
+    - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > codeclimate.json
+  artifacts:
+    paths: [codeclimate.json]
+
 coverage:
   stage: post-test
   services: []
@@ -527,18 +542,3 @@ cache gems:
   only:
     - master@gitlab-org/gitlab-ce
     - master@gitlab-org/gitlab-ee
-
-codeclimate:
-  before_script: []
-  image: docker:latest
-  stage: post-test
-  variables:
-    SETUP_DB: "false"
-    DOCKER_DRIVER: overlay
-  services:
-    - docker:dind
-  script:
-    - docker pull codeclimate/codeclimate
-    - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > codeclimate.json
-  artifacts:
-    paths: [codeclimate.json]