diff --git a/charts/.utils/gitlab-ci.yaml b/charts/.utils/gitlab-ci.yaml
index 46ab14fb5355c82e0dda216f40621cdd04c67a8b..123ccb894f5d6ce9f08e917456c3afb1701e3b39 100644
--- a/charts/.utils/gitlab-ci.yaml
+++ b/charts/.utils/gitlab-ci.yaml
@@ -8,6 +8,8 @@
 chart-package:
   stage: build
   extends: .chart-matrix
+  needs:
+    - chart-helm-unittest
   image: quay.io/helmpack/chart-testing:v3.6.0
   script:
     - export TMP_DIR=$(mktemp -d)
@@ -25,15 +27,14 @@ chart-helm-unittest:
     name: docker.io/quintush/helm-unittest:3.10.0-0.2.9
     entrypoint: [""]
   script:
-    - helm unittest -3 -o helm-unittest.xml -t junit charts/${CHART}
+    - if [ ! -e charts/${CHART}/tests ]; then echo "No helm unittests"; exit 0; fi
+    - helm unittest -3 -o helm-unittest-${CHART}.xml -t junit charts/${CHART}
   artifacts:
     when: always
     reports:
       junit:
-        - helm-unittest.xml
+        - helm-unittest-${CHART}.xml
   rules:
     - if: '$CI_PIPELINE_SOURCE == "push"'
       changes:
         - charts/${CHART}/**/*
-      exists:
-        - charts/${CHART}/tests/**/*