diff --git a/test/scripts/jenkins_test_setup_oss.sh b/test/scripts/jenkins_test_setup_oss.sh
index b7eac33f351768..53626ce89462ad 100755
--- a/test/scripts/jenkins_test_setup_oss.sh
+++ b/test/scripts/jenkins_test_setup_oss.sh
@@ -3,11 +3,7 @@
 source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$CODE_COVERAGE" ]]; then
-
-  destDir="build/kibana-build-oss"
-  if [[ ! "$TASK_QUEUE_PROCESS_ID" ]]; then
-    destDir="${destDir}-${CI_PARALLEL_PROCESS_NUMBER}"
-  fi
+  destDir="$WORKSPACE/kibana-build-oss-${TASK_QUEUE_PROCESS_ID:-$CI_PARALLEL_PROCESS_NUMBER}"
 
   if [[ ! -d $destDir ]]; then
     mkdir -p $destDir
diff --git a/test/scripts/jenkins_test_setup_xpack.sh b/test/scripts/jenkins_test_setup_xpack.sh
index 74a3de77e3a760..b9227fd8ff4160 100755
--- a/test/scripts/jenkins_test_setup_xpack.sh
+++ b/test/scripts/jenkins_test_setup_xpack.sh
@@ -3,11 +3,7 @@
 source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$CODE_COVERAGE" ]]; then
-
-  destDir="build/kibana-build-xpack"
-  if [[ ! "$TASK_QUEUE_PROCESS_ID" ]]; then
-    destDir="${destDir}-${CI_PARALLEL_PROCESS_NUMBER}"
-  fi
+  destDir="$WORKSPACE/kibana-build-xpack-${TASK_QUEUE_PROCESS_ID:-$CI_PARALLEL_PROCESS_NUMBER}"
 
   if [[ ! -d $destDir ]]; then
     mkdir -p $destDir