diff --git a/test/4-describe-data-1-list.sh b/test/4-describe-data-1-list.sh
index 021188f..a1d9120 100755
--- a/test/4-describe-data-1-list.sh
+++ b/test/4-describe-data-1-list.sh
@@ -4,7 +4,7 @@
 
 cd "$CURR_DIR"/describe-project
 
-temp_file=`mktemp`
+temp_file=$(mktemp $(basename $0).XXXXXX)
 
 function cleanup {
     rm $temp_file
diff --git a/test/4-describe-data-2-dmd.sh b/test/4-describe-data-2-dmd.sh
index 64af07d..53964f9 100755
--- a/test/4-describe-data-2-dmd.sh
+++ b/test/4-describe-data-2-dmd.sh
@@ -9,7 +9,7 @@
 
 cd "$CURR_DIR"/describe-project
 
-temp_file=`mktemp`
+temp_file=$(mktemp $(basename $0).XXXXXX)
 
 function cleanup {
     rm $temp_file
diff --git a/test/4-describe-data-3-zero-delim.sh b/test/4-describe-data-3-zero-delim.sh
index 68a749b..8df3e20 100755
--- a/test/4-describe-data-3-zero-delim.sh
+++ b/test/4-describe-data-3-zero-delim.sh
@@ -4,8 +4,8 @@
 
 cd "$CURR_DIR"/describe-project
 
-temp_file_normal=`mktemp`
-temp_file_zero_delim=`mktemp`
+temp_file_normal=$(mktemp $(basename $0).XXXXXX)
+temp_file_zero_delim=$(mktemp $(basename $0).XXXXXX)
 
 function cleanup {
     rm $temp_file_normal
diff --git a/test/4-describe-import-paths.sh b/test/4-describe-import-paths.sh
index acbf736..71822b4 100755
--- a/test/4-describe-import-paths.sh
+++ b/test/4-describe-import-paths.sh
@@ -4,7 +4,7 @@
 
 cd "$CURR_DIR"/describe-project
 
-temp_file=`mktemp`
+temp_file=$(mktemp $(basename $0).XXXXXX)
 
 function cleanup {
     rm $temp_file
diff --git a/test/4-describe-json.sh b/test/4-describe-json.sh
index f457249..cdd2a2b 100755
--- a/test/4-describe-json.sh
+++ b/test/4-describe-json.sh
@@ -4,7 +4,7 @@
 
 cd "$CURR_DIR"/describe-project
 
-temp_file=`mktemp`
+temp_file=$(mktemp $(basename $0).XXXXXX)
 
 function cleanup {
     rm $temp_file
diff --git a/test/4-describe-string-import-paths.sh b/test/4-describe-string-import-paths.sh
index c2a3f23..772c8c4 100755
--- a/test/4-describe-string-import-paths.sh
+++ b/test/4-describe-string-import-paths.sh
@@ -4,7 +4,7 @@
 
 cd "$CURR_DIR"/describe-project
 
-temp_file=`mktemp`
+temp_file=$(mktemp $(basename $0).XXXXXX)
 
 function cleanup {
     rm $temp_file
diff --git a/test/issue616-describe-vs-generate-commands.sh b/test/issue616-describe-vs-generate-commands.sh
index f53f766..eefe296 100755
--- a/test/issue616-describe-vs-generate-commands.sh
+++ b/test/issue616-describe-vs-generate-commands.sh
@@ -3,7 +3,7 @@
 
 cd "$CURR_DIR"/issue616-describe-vs-generate-commands
 
-temp_file=`mktemp`
+temp_file=$(mktemp $(basename $0).XXXXXX)
 
 function cleanup {
     rm $temp_file
diff --git a/test/issue674-concurrent-dub.sh b/test/issue674-concurrent-dub.sh
index b31417e..984ad42 100755
--- a/test/issue674-concurrent-dub.sh
+++ b/test/issue674-concurrent-dub.sh
@@ -2,8 +2,7 @@
 
 set -e -o pipefail
 
-TMPDIR=$(mktemp -d)
-echo ${TMPDIR}
+TMPDIR=$(mktemp -d $(basename $0).XXXXXX)
 
 function cleanup {
     rm -rf ${TMPDIR}