diff --git a/xa/tests/fordef/Makefile b/xa/tests/fordef/Makefile
new file mode 100644
index 0000000..b847663
--- /dev/null
+++ b/xa/tests/fordef/Makefile
@@ -0,0 +1,5 @@
+
+tests:
+	./runtest.sh -q -C
+
+
diff --git a/xa/tests/fordef/runtest.sh b/xa/tests/fordef/runtest.sh
new file mode 100755
index 0000000..80f3aed
--- /dev/null
+++ b/xa/tests/fordef/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[02.asm]="-C"
+
+#ASMFLAGS=-v
+ASMFLAGS=
+
+# exclude filter from *.asm if no explicit file is given
+EXCLUDE=
+
+# test files used
+TESTFILES="test2.s"
+
+# files to compare afterwards, against <file>-<script>
+COMPAREFILES="a.out test.asm.err test4.asm.err"
+
+XA=$THISDIR/../../xa
+
+##########################
+# actual code
+. ../func.sh
+
diff --git a/xa/tests/fordef/test.asm b/xa/tests/fordef/test.asm
index 3df82bb..7d7b4f4 100644
--- a/xa/tests/fordef/test.asm
+++ b/xa/tests/fordef/test.asm
@@ -16,5 +16,5 @@ t1	lda `forward1
 	sta `forward2
 	rts
 
-#include "test2.asm"
+#include "test2.s"
 
diff --git a/xa/tests/fordef/test.asm.err-test b/xa/tests/fordef/test.asm.err-test
new file mode 100644
index 0000000..753b3a2
--- /dev/null
+++ b/xa/tests/fordef/test.asm.err-test
@@ -0,0 +1,4 @@
+Copyright (C) 1989-2009 Andre Fachat, Jolse Maginnis, David Weinehall
+and Cameron Kaiser.
+test.asm:line 6: 0400: Warning - Can't optimize forward-defined label; using absolute addressing
+test.asm:line 7: 0403: Warning - Can't optimize forward-defined label; using absolute addressing
diff --git a/xa/tests/fordef/test2.asm b/xa/tests/fordef/test2.s
similarity index 100%
rename from xa/tests/fordef/test2.asm
rename to xa/tests/fordef/test2.s
diff --git a/xa/tests/fordef/test3.asm b/xa/tests/fordef/test3.asm
index 0429816..0360fa1 100644
--- a/xa/tests/fordef/test3.asm
+++ b/xa/tests/fordef/test3.asm
@@ -18,4 +18,4 @@
 	lda (forward1),y
 	jmp forward3
 
-#include "test2.asm"
+#include "test2.s"
diff --git a/xa/tests/fordef/test4.asm b/xa/tests/fordef/test4.asm
new file mode 100644
index 0000000..2272d71
--- /dev/null
+++ b/xa/tests/fordef/test4.asm
@@ -0,0 +1,18 @@
+	.word $0400
+	*=$0400
+
+/* define this if you want to crash and burn */
+
+	jmp `forward3
+	bne `forward3
+	lda (`forward1),y
+	lda (`forward3),y
+
+	sta `forward3
+
+/* this looks like it should fail, but won't because there is no ambiguity */
+
+	lda (forward1),y
+	jmp forward3
+
+#include "test2.s"
diff --git a/xa/tests/fordef/test4.asm.err-test4 b/xa/tests/fordef/test4.asm.err-test4
new file mode 100644
index 0000000..f002e29
--- /dev/null
+++ b/xa/tests/fordef/test4.asm.err-test4
@@ -0,0 +1,7 @@
+Copyright (C) 1989-2009 Andre Fachat, Jolse Maginnis, David Weinehall
+and Cameron Kaiser.
+test4.asm:line 6: 0400:Wrong addressing mode error
+test4.asm:line 7: 0402:Wrong addressing mode error
+test4.asm:line 8: 0401:Wrong addressing mode error
+test4.asm:line 9: 0400:Wrong addressing mode error
+test4.asm:line 9: 0409:Overflow error
diff --git a/xa/tests/func.sh b/xa/tests/func.sh
index 45197c8..45650d5 100755
--- a/xa/tests/func.sh
+++ b/xa/tests/func.sh
@@ -202,6 +202,7 @@ for script in $TESTSCRIPTS; do
 	else
 		ALOG="-P $LOGFILE"
 	fi
+	ALOG="$ALOG -e $script.err"
 
         # overwrite test files in each iteration, just in case
         for i in $TESTFILES; do
@@ -275,6 +276,7 @@ if test $CLEAN -ge 2; then
 
         for script in $TESTSCRIPTS; do
                 rm -f $TMPDIR/$script.log
+                rm -f $TMPDIR/$script.err
         done;
 
         # gzipped test files are unzipped