diff --git a/test/test.sh b/test/test.sh
index de170cd..1cdac77 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -31,8 +31,8 @@ if [ $? -eq 0 ];then
 	add_err "wifish should fail with WIFISH_DEFAULT as 'foo'"
 fi
 
-tfile=$(mktemp /tmp/$$.XXX.parsed)
-efile=$(mktemp /tmp/$$.XXX.parsed.err)
+tfile=$(mktemp /tmp/$$.parsed.XXXXXX)
+efile=$(mktemp /tmp/$$.parsed.err.XXXXXX)
 trap 'rm -f $tfile' INT TERM EXIT
 trap 'rm -f $efile' INT TERM EXIT
 WIFISH_DEFAULT=list AWK_LOCATION=./awk _IN_TEST=true ./wifish >$tfile 2>$efile
diff --git a/wifish b/wifish
index fdc0317..b7e756d 100755
--- a/wifish
+++ b/wifish
@@ -73,7 +73,7 @@ scan_results() { # {{{ # Scans for APs or shows scanned results. Writes to $stem
 
 	echo " * Scanning For APs ..." >&2
         # Get the data
-	stemp=$(mktemp /tmp/$$.XXXX.menu)
+	stemp=$(mktemp /tmp/$$.menu.XXXXXX)
 	trap 'rm -f $stemp' INT TERM EXIT
 	if [ -n "$_IN_TEST" ];then # {{{ # Test/Mock mode
                 cat data/wscan.txt > $stemp # }}}