diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2af9bba2..59479e16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ stages:
   - image
   - lint
   - test
+  - report
 
 variables:
   CODECOV_TOKEN: 4d2d8534-60ec-48b3-bf55-93b92f25913d
@@ -56,13 +57,13 @@ validate_code:
   script:
     - nox -s validate_code
 
-tests:
-  stage: test
-  needs:
-    - job: "CI image"
-      optional: true
-  script:
-    - tox -e py39-fft,codecov
+# tests:
+#   stage: test
+#   needs:
+#     - job: "CI image"
+#       optional: true
+#   script:
+#     - tox -e py39-fft,codecov
 
 test_without_fft_and_pythran:
   stage: test
@@ -71,3 +72,20 @@ test_without_fft_and_pythran:
       optional: true
   script:
     - nox -s test_without_fft_and_pythran
+  artifacts:
+    paths:
+      - .coverage/*
+    expire_in: 10 mins
+
+report_coverage:
+  stage: report
+  needs:
+    - job: test_without_fft_and_pythran
+  if: $CI_COMMIT_BRANCH == null
+    variables:
+      CI_COMMIT_BRANCH: $CI_COMMIT_HG_BRANCH
+  script:
+    - pip install coverage codecov
+    - make _report_coverage
+    - codecov --file .coverage/coverage.xml --commit $CI_COMMIT_SHA \
+        --branch $CI_COMMIT_BRANCH --name Heptapod$CI_JOB_ID