diff --git a/tools/runners/run-test-suite.sh b/tools/runners/run-test-suite.sh
index 551963793..2b7f60f5b 100755
--- a/tools/runners/run-test-suite.sh
+++ b/tools/runners/run-test-suite.sh
@@ -112,7 +112,7 @@ do
     if [ "$IS_SNAPSHOT" == true ]
     then
         # Testing snapshot
-        SNAPSHOT_TEMP=`mktemp snapshot-out.XXXXXXXXXX`
+        SNAPSHOT_TEMP=`mktemp $(basename -s .js $test).XXXXXXXXXX.snapshot`
 
         cmd_line="${ENGINE#$ROOT_DIR} $ENGINE_ARGS --save-snapshot-for-global $SNAPSHOT_TEMP ${full_test#$ROOT_DIR}"
         ( ulimit -t $TIMEOUT; $ENGINE $ENGINE_ARGS --save-snapshot-for-global $SNAPSHOT_TEMP $full_test &> $ENGINE_TEMP )
@@ -162,6 +162,11 @@ rm -f $ENGINE_TEMP
 
 ratio=$(echo $passed*100/$total | bc)
 
+if [ "$IS_SNAPSHOT" == true ]
+then
+    ENGINE_ARGS="--snapshot $ENGINE_ARGS"
+fi
+
 echo "[summary] ${ENGINE#$ROOT_DIR} $ENGINE_ARGS ${TESTS#$ROOT_DIR}: $passed PASS, $failed FAIL, $total total, $ratio% success"
 
 if [ $failed -ne 0 ]