diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index 685cee4..f408f61 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -24,7 +24,7 @@ update: $(vf_blk_fth_files) $(vf_fth_files_petscii)
 
 
 clean:
-	rm -f cbmfiles/*.fr cbmfiles/*.fth cbmfiles/*.log
+	rm -f cbmfiles/*.fr cbmfiles/*.fth cbmfiles/*.log tmp/*
 	rm -f *.log *.result *.golden
 	rm -f cbmfiles/c??-testbase
 	rm -f disks/scratch.d64 emulator/sdcard.img
@@ -132,7 +132,7 @@ test-v4th-c16-.log: emulator/v4th-c16-.T64
 test-v4th-x16.log: cbmfiles/v4th-x16 emulator/sdcard.img
 	rm -f cbmfiles/test.log
 	emulator/run-in-x16emu.sh v4th-x16 \
-	  "INCLUDE RUN-STD-TESTS.FTH\\X0D1234567890\\X0D"
+	  "include run-std-tests.fth\n1234567890\n"
 	mcopy -i emulator/sdcard.img ::TEST.LOG cbmfiles/test.log
 	petscii2ascii cbmfiles/test.log $@
 
diff --git a/6502/C64/emulator/run-in-x16emu.sh b/6502/C64/emulator/run-in-x16emu.sh
index d228b37..ee7af5a 100755
--- a/6502/C64/emulator/run-in-x16emu.sh
+++ b/6502/C64/emulator/run-in-x16emu.sh
@@ -5,9 +5,10 @@ emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
 basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
 cbmfilesdir="${basedir}/cbmfiles"
 sdcard="${emulatordir}/sdcard.img"
+x16script="${basedir}/tmp/x16script"
 
 mformat -i "${sdcard}" -F
-for asciifile in  $(cd "${cbmfilesdir}" && ls *.fth *fr)
+for asciifile in  $(cd "${cbmfilesdir}" && ls)
 do
   # Convert filename to PETSCII, remove trailing CR.
   petsciifile="$(echo ${asciifile} | ascii2petscii - |tr -d '\r')"
@@ -20,13 +21,18 @@ then
   autostart="-prg ${cbmfilesdir}/${1} -run"
 fi
 
-keybuf=""
+script=""
 warp=""
 scale=""
 debug=""
 if [ -n "$2" ]
 then
-  keybuf="${2}"
+  test -d tmp || mkdir tmp
+  rm -f "${x16script}".*
+  echo "load\"${1}\"\nrun\n${2}" | sed 's/\\n/\n/g' > "${x16script}".ascii
+  ascii2petscii "${x16script}.ascii" "${x16script}.petscii"
+  script="-bas ${x16script}.petscii"
+  autostart=""
   mcopy -i "${sdcard}" "${emulatordir}/notdone" "::NOTDONE"
   warp="-warp"
 else
@@ -39,13 +45,13 @@ x16emu \
   -keymap de \
   -sdcard "${sdcard}" \
   $autostart \
-  -keybuf "$keybuf" \
+  $script \
   $warp \
   $scale \
   $debug \
   &
 
-if [ -n "$keybuf" ]
+if [ -n "$script" ]
 then
   while mtype -i "${sdcard}" "::NOTDONE" > /dev/null
     do sleep 1