diff --git a/tests/common.sh b/tests/common.sh
index c508d615..7b3ec6dd 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -48,12 +48,12 @@ update_config() {
 	file=$1
 	username=$(whoami)
 	group=$(groups|cut -f 1 -d ' ')
-	cp "${srcdir}/data/${file}" "$file.tmp"
-	sed -i 's|@USERNAME@|'${username}'|g' "$file.tmp"
-	sed -i 's|@GROUP@|'${group}'|g' "$file.tmp"
-	sed -i 's|@SRCDIR@|'${srcdir}'|g' "$file.tmp"
-	sed -i 's|@CRLNAME@|'${CRLNAME}'|g' "$file.tmp"
-	CONFIG="$file.tmp"
+	cp "${srcdir}/data/${file}" "$file.$$.tmp"
+	sed -i 's|@USERNAME@|'${username}'|g' "$file.$$.tmp"
+	sed -i 's|@GROUP@|'${group}'|g' "$file.$$.tmp"
+	sed -i 's|@SRCDIR@|'${srcdir}'|g' "$file.$$.tmp"
+	sed -i 's|@CRLNAME@|'${CRLNAME}'|g' "$file.$$.tmp"
+	CONFIG="$file.$$.tmp"
 }
 
 fail() {