diff --git a/makeself-header.sh b/makeself-header.sh
index 53e3577..4f5df38 100755
--- a/makeself-header.sh
+++ b/makeself-header.sh
@@ -615,6 +615,7 @@ else
 	eval \$finish
 	exit 1
     }
+    find "\$tmpdir" -mindepth 1 -delete
 fi
 
 location="\`pwd\`"
diff --git a/test/suidtest b/test/suidtest
old mode 100644
new mode 100755
index 252f79c..b9545ab
--- a/test/suidtest
+++ b/test/suidtest
@@ -13,7 +13,7 @@ testSuidDoesntGetBroken() {
     )
     # Create the self extracting that should extract deployedfile
     local file_name="$(mktemp -t file_name.XXXXXX)"
-    "${SUT}" --target "${archive_dir}" "${archive_dir}" "${file_name}" "suid test"
+    "${SUT}" --notemp --target "${archive_dir}" "${archive_dir}" "${file_name}" "suid test"
     assertEquals $? 0
     # Target directory now has another file with sudo permissions
     # This will get broken because of chown -R