diff --git a/cicd_testing/starstest.sh b/cicd_testing/starstest.sh
index 5115b25181e0b3935970f794248960ba61621c2e..6aa341c9200e843e209fc7dddc8be1e302ab8a67 100755
--- a/cicd_testing/starstest.sh
+++ b/cicd_testing/starstest.sh
@@ -45,7 +45,8 @@ set -x
 
 cd $CICD_MODULE_WORK_DIR/stars_umbrella
 source set_env_vars
-cd /tmp
+mkdir /tmp/stars_test
+cd /tmp/stars_test
 
 # Build and test each of the optimization levels -O0, -Og, and -O3.
 if build_and_test O0 ; then
diff --git a/cicd_testing/xform-ls.sh b/cicd_testing/xform-ls.sh
index ffcea7fc767233176772f64d77184fa4a6f40fe0..18de145e50e9bfeace2f6d1736c5e97c8f9eb9f5 100755
--- a/cicd_testing/xform-ls.sh
+++ b/cicd_testing/xform-ls.sh
@@ -4,7 +4,8 @@ set -x
 
 cd $CICD_MODULE_WORK_DIR/stars_umbrella
 source set_env_vars
-cd /tmp
+mkdir -p /tmp/stars_test
+cd /tmp/stars_test
 rm -rf ls.stars.killdeads stars_ped_ls; $PSZ /bin/ls ./ls.stars.killdeads -c rida=on -s meds_static=off -c kill_deads=on --tempdir stars_ped_ls || true
 if [[ ! -x ./ls.stars.killdeads ]]; then cat stars_ped_ls/logs/*; fi
 rm -rf stars_ped_ls