diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba2bf177..779e7540 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ run_unit_test:
   image: ${COMMON_IMAGE}
   allow_failure: false
   script:
+  - "./gitlab-ci/pipeline_setup.sh"
   - "./gitlab-ci/install-dependencies.sh"
   - "./gitlab-ci/setup.sh"
   - "./gitlab-ci/unit-test.sh"
@@ -37,7 +38,7 @@ run_tools_test:
   image: ${COMMON_IMAGE}
   allow_failure: false
   script:
-  - "./gitlab-ci/setup.sh"
+  - "./gitlab-ci/pipeline_setup.sh"
   - "./gitlab-ci/tools-test.sh"
   - "./gitlab-ci/generate_supported_dm.sh"
 
diff --git a/gitlab-ci/pipeline_setup.sh b/gitlab-ci/pipeline_setup.sh
new file mode 100755
index 00000000..53a72243
--- /dev/null
+++ b/gitlab-ci/pipeline_setup.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "# Setting pipeline ci credentials"
+
+echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}" > ~/.git-credential
+git config --global credential.helper "store --file ~/.git-credential"
+
diff --git a/gitlab-ci/setup.sh b/gitlab-ci/setup.sh
index 8add2d50..45eb3983 100755
--- a/gitlab-ci/setup.sh
+++ b/gitlab-ci/setup.sh
@@ -2,9 +2,7 @@
 
 echo "# Preparation script ..."
 
-echo "Setting Git config"
-echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}" > ~/.git-credential
-git config --global credential.helper "store --file ~/.git-credential"
+./gitlab-ci/pipeline_setup.sh
 
 # link '/bin/sh' to bash instead of dash
 ln -sf bash /bin/sh