diff --git a/Jenkinsfile b/Jenkinsfile
index 9bb110e4afb5ce6d635a114f7830aa44d82a9536..ebc5837a21ab61bea6007a999cb3542b627e101e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -134,11 +134,9 @@ pipeline {
                     FAILED_STAGE=env.STAGE_NAME
                     HELM_CHART_VERSION = generateHelmChartVersion()
 
-                    dir('src/main/helm') {
-                        sh "helm lint -f ../../test/helm-linter-values.yaml"
-
-                        sh "helm unittest --helm3 -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
+                    sh "./run_helm_test.sh"
 
+                    dir('src/main/helm') {
                         sh "helm package --version=${HELM_CHART_VERSION} ."
 
                         deployHelmChart("Intelliform-Adapter", HELM_CHART_VERSION)
@@ -152,12 +150,12 @@ pipeline {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
                     HELM_CHART_VERSION = generateHelmChartVersion()
-
+                    
                     dir('xta-adapter/src/main/helm') {
-                        sh "helm lint -f test-values.yaml"
-
-                        sh "helm unittest --helm3 -f '../../test/helm/*.yaml' -v '../../test/helm/values/unit-values.yaml' ."
+                        sh "./run_helm_test.sh"
+                    }
 
+                    dir('xta-adapter/src/main/helm') {
                         sh "helm package --version=${HELM_CHART_VERSION} ."
 
                         deployHelmChart("xta-adapter", HELM_CHART_VERSION)