diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 779e7540..8331c3c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,7 @@ run_libbbfdm_api_functional_test:
   image: ${COMMON_IMAGE}
   allow_failure: false
   script:
+  - "./gitlab-ci/pipeline_setup.sh"
   - "./gitlab-ci/install-dependencies.sh"
   - "./gitlab-ci/setup.sh"
   - "./gitlab-ci/functional-api-test.sh"
@@ -68,6 +69,7 @@ run_libbbfdm_functional_test:
   image: ${COMMON_IMAGE}
   allow_failure: false
   script:
+  - "./gitlab-ci/pipeline_setup.sh"
   - "./gitlab-ci/install-dependencies.sh"
   - "./gitlab-ci/setup.sh"
   - "./gitlab-ci/functional-test.sh"
@@ -82,6 +84,7 @@ run_libbbfdm_memory_test:
   image: ${COMMON_IMAGE}
   allow_failure: false
   script:
+  - "./gitlab-ci/pipeline_setup.sh"
   - "./gitlab-ci/install-dependencies.sh"
   - "./gitlab-ci/setup.sh"
   - "./gitlab-ci/memory-test.sh"
@@ -96,6 +99,7 @@ run_bbfd_functional_test:
     image: ${COMMON_IMAGE}
     allow_failure: false
     script:
+    - "./gitlab-ci/pipeline_setup.sh"
     - "./gitlab-ci/install-dependencies.sh"
     - "./gitlab-ci/setup.sh"
     - "./gitlab-ci/bbfdmd-functional-test.sh"
diff --git a/gitlab-ci/setup.sh b/gitlab-ci/setup.sh
index 45eb3983..30893b29 100755
--- a/gitlab-ci/setup.sh
+++ b/gitlab-ci/setup.sh
@@ -2,8 +2,6 @@
 
 echo "# Preparation script ..."
 
-./gitlab-ci/pipeline_setup.sh
-
 # link '/bin/sh' to bash instead of dash
 ln -sf bash /bin/sh