diff --git a/run-unit-test-docker.sh b/run-unit-test-docker.sh
index 3d354e8..0a2ed9c 100755
--- a/run-unit-test-docker.sh
+++ b/run-unit-test-docker.sh
@@ -12,7 +12,7 @@
 # Default variables
 DOCKER_IMG_NAME="openbmc/ubuntu-unit-test"
 DISTRO=${DISTRO:-ubuntu:latest}
-WORKSPACE=${WORKSPACE:-${TMP}/unit-test${RANDOM}}
+WORKSPACE=${WORKSPACE:-$(mktemp -d --tmpdir unit-test.XXXXXX)}
 OBMC_BUILD_SCRIPTS="openbmc-build-scripts"
 UNIT_TEST_PY_DIR="scripts"
 UNIT_TEST_PY="unit-test.py"