diff --git a/xa/tests/Makefile b/xa/tests/Makefile
index c23f1ef..f302250 100644
--- a/xa/tests/Makefile
+++ b/xa/tests/Makefile
@@ -2,4 +2,6 @@
 tests:
 	(cd adrm; make tests)
 	(cd binclude; make tests)
+	(cd chardelimiter; make tests)
+	(cd charset; make tests)
 
diff --git a/xa/tests/charset/Makefile b/xa/tests/charset/Makefile
new file mode 100644
index 0000000..b847663
--- /dev/null
+++ b/xa/tests/charset/Makefile
@@ -0,0 +1,5 @@
+
+tests:
+	./runtest.sh -q -C
+
+
diff --git a/xa/tests/charset/a.out-test b/xa/tests/charset/a.out-test
new file mode 100644
index 0000000..c40bd10
Binary files /dev/null and b/xa/tests/charset/a.out-test differ
diff --git a/xa/tests/charset/a.o65 b/xa/tests/charset/a.out-testpet
similarity index 100%
rename from xa/tests/charset/a.o65
rename to xa/tests/charset/a.out-testpet
diff --git a/xa/tests/charset/runtest.sh b/xa/tests/charset/runtest.sh
new file mode 100755
index 0000000..4ffa16a
--- /dev/null
+++ b/xa/tests/charset/runtest.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# run a test script
+
+#THISDIR=`dirname $0`
+THISDIR=`pwd`
+
+echo "0=$0"
+echo "THISDIR=$THISDIR"
+
+declare -A opts
+#opts=([816.asm]="-w")
+opts[testpet.asm]="-OPETSCII"
+
+#ASMFLAGS=-v
+ASMFLAGS=
+
+# exclude filter from *.asm if no explicit file is given
+EXCLUDE=
+
+# test files used
+TESTFILES="README.1st test2.s"
+
+# files to compare afterwards, against <file>-<script>
+COMPAREFILES=a.out
+
+XA=$THISDIR/../../xa
+
+##########################
+# actual code
+. ../func.sh
+
diff --git a/xa/tests/charset/testpet.asm b/xa/tests/charset/testpet.asm
new file mode 100644
index 0000000..645b528
--- /dev/null
+++ b/xa/tests/charset/testpet.asm
@@ -0,0 +1,16 @@
+	.word $9000
+	* = $9000
+
+	w = 10
+.bin 0,10+w,"README.1st"
+.bin 0,10,"README.1st"
+#include "test2.s"
+.byt "FooBar"
+.aasc "FooBar"
+.asc "FooBar",65,97,10
+.aasc "FooBar"
+.bin 0,10,"README.1st"
+.aasc "Barfoo",65,97,10
+
+lda #'A'
+lda #"A"