diff --git a/test/asm/listing/Makefile b/test/asm/listing/Makefile
index 272a6904c..e4528dd06 100644
--- a/test/asm/listing/Makefile
+++ b/test/asm/listing/Makefile
@@ -49,64 +49,64 @@ $(WORKDIR)/$1.bin: $1.s $(ISEQUAL)
 	$(if $(QUIET),echo asm/$1.bin)
 
 #	compile without generating listing
-ifeq ($(wildcard $1.err),)
+ifeq ($(wildcard control/$1.err),)
 	$(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2>&1
-ifeq ($(wildcard $1.no-ld65),)
+ifeq ($(wildcard control/$1.no-ld65),)
 	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib
 endif
 else
 	$(CA65) -t none -o $$(@:.bin=.o) $$< > $$(@:.bin=.err) 2>&1 || true
-ifeq ($(wildcard $1.no-ld65),)
+ifeq ($(wildcard control/$1.no-ld65),)
 	$(LD65) -t none -o $$@ $$(@:.bin=.o) none.lib || true
 endif
 endif
 
-ifneq ($(wildcard $1.err-ref),)
-	$(ISEQUAL) $1.err-ref $$(@:.bin=.err)
+ifneq ($(wildcard ref/$1.err-ref),)
+	$(ISEQUAL) ref/$1.err-ref $$(@:.bin=.err)
 else
 	$(ISEQUAL) --empty $$(@:.bin=.err)
 endif
 
-ifneq ($(wildcard $1.bin-ref),)
-	$(ISEQUAL) --binary $1.bin-ref $$@
+ifneq ($(wildcard ref/$1.bin-ref),)
+	$(ISEQUAL) --binary ref/$1.bin-ref $$@
 endif
 
-ifeq ($(wildcard $1.err),)
+ifeq ($(wildcard control/$1.err),)
 	$(CA65) -t none -l $$(@:.bin=.lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2>&1
-ifeq ($(wildcard $1.no-ld65),)
+ifeq ($(wildcard control/$1.no-ld65),)
 	$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.ld65-err) 2>&1
 endif
 else
 	$(CA65) -t none -l $$(@:.bin=.lst) -o $$(@:.bin=.list-o) $$< > $$(@:.bin=.list-err) 2>&1 || true
-ifeq ($(wildcard $1.no-ld65),)
+ifeq ($(wildcard control/$1.no-ld65),)
 	$(LD65) -t none -o $$(@:.bin=.list-bin) $$(@:.bin=.list-o) none.lib > $$(@:.bin=.ld65-err) 2>&1 || true
 endif
 endif
 
-ifneq ($(wildcard $1.err-ref),)
-	$(ISEQUAL) $1.err-ref $$(@:.bin=.list-err)
+ifneq ($(wildcard ref/$1.err-ref),)
+	$(ISEQUAL) ref/$1.err-ref $$(@:.bin=.list-err)
 else
 	$(ISEQUAL) --empty $$(@:.bin=.list-err)
 endif
 
 ifneq ($(wildcard $(WORKDIR)/$1.ld65-err),)
-ifneq ($(wildcard $1.ld65err-ref),)
-	$(ISEQUAL) $1.ld65err-ref $$(@:.bin=.ld65-err)
+ifneq ($(wildcard ref/$1.ld65err-ref),)
+	$(ISEQUAL) ref/$1.ld65err-ref $$(@:.bin=.ld65-err)
 else
 	$(ISEQUAL) --empty $$(@:.bin=.ld65-err)
 endif
 endif
 
 #	check if the result bin is the same as without listing file
-ifeq ($(wildcard $1.err),)
+ifeq ($(wildcard control/$1.err),)
 	$(ISEQUAL) $$@ $$(@:.bin=.list-bin)
 endif
 
-ifneq ($(wildcard $1.list-ref),)
+ifneq ($(wildcard ref/$1.list-ref),)
 #	we have a reference file, compare that, too
 
 #	remove first line which contains a version number
-	$(ISEQUAL) --skip=1 $1.list-ref $$(@:.bin=.lst)
+	$(ISEQUAL) --skip=1 ref/$1.list-ref $$(@:.bin=.lst)
 endif
 
 endef # LISTING_template
diff --git a/test/asm/listing/031-assert-error.err b/test/asm/listing/control/031-assert-error.err
similarity index 100%
rename from test/asm/listing/031-assert-error.err
rename to test/asm/listing/control/031-assert-error.err
diff --git a/test/asm/listing/031-assert-error.no-ld65 b/test/asm/listing/control/031-assert-error.no-ld65
similarity index 100%
rename from test/asm/listing/031-assert-error.no-ld65
rename to test/asm/listing/control/031-assert-error.no-ld65
diff --git a/test/asm/listing/032-assert-error2.err b/test/asm/listing/control/032-assert-error2.err
similarity index 100%
rename from test/asm/listing/032-assert-error2.err
rename to test/asm/listing/control/032-assert-error2.err
diff --git a/test/asm/listing/032-assert-error3.err b/test/asm/listing/control/032-assert-error3.err
similarity index 100%
rename from test/asm/listing/032-assert-error3.err
rename to test/asm/listing/control/032-assert-error3.err
diff --git a/test/asm/listing/001-macro-simple-listing.list-ref b/test/asm/listing/ref/001-macro-simple-listing.list-ref
similarity index 100%
rename from test/asm/listing/001-macro-simple-listing.list-ref
rename to test/asm/listing/ref/001-macro-simple-listing.list-ref
diff --git a/test/asm/listing/002-macro-param-listing.list-ref b/test/asm/listing/ref/002-macro-param-listing.list-ref
similarity index 100%
rename from test/asm/listing/002-macro-param-listing.list-ref
rename to test/asm/listing/ref/002-macro-param-listing.list-ref
diff --git a/test/asm/listing/010-paramcount.err-ref b/test/asm/listing/ref/010-paramcount.err-ref
similarity index 100%
rename from test/asm/listing/010-paramcount.err-ref
rename to test/asm/listing/ref/010-paramcount.err-ref
diff --git a/test/asm/listing/020-asciiz.bin-ref b/test/asm/listing/ref/020-asciiz.bin-ref
similarity index 100%
rename from test/asm/listing/020-asciiz.bin-ref
rename to test/asm/listing/ref/020-asciiz.bin-ref
diff --git a/test/asm/listing/020-asciiz.list-ref b/test/asm/listing/ref/020-asciiz.list-ref
similarity index 100%
rename from test/asm/listing/020-asciiz.list-ref
rename to test/asm/listing/ref/020-asciiz.list-ref
diff --git a/test/asm/listing/030-assert-success.bin-ref b/test/asm/listing/ref/030-assert-success.bin-ref
similarity index 100%
rename from test/asm/listing/030-assert-success.bin-ref
rename to test/asm/listing/ref/030-assert-success.bin-ref
diff --git a/test/asm/listing/030-assert-success.err-ref b/test/asm/listing/ref/030-assert-success.err-ref
similarity index 100%
rename from test/asm/listing/030-assert-success.err-ref
rename to test/asm/listing/ref/030-assert-success.err-ref
diff --git a/test/asm/listing/030-assert-success.ld65err-ref b/test/asm/listing/ref/030-assert-success.ld65err-ref
similarity index 100%
rename from test/asm/listing/030-assert-success.ld65err-ref
rename to test/asm/listing/ref/030-assert-success.ld65err-ref
diff --git a/test/asm/listing/031-assert-error.err-ref b/test/asm/listing/ref/031-assert-error.err-ref
similarity index 100%
rename from test/asm/listing/031-assert-error.err-ref
rename to test/asm/listing/ref/031-assert-error.err-ref
diff --git a/test/asm/listing/032-assert-error2.ld65err-ref b/test/asm/listing/ref/032-assert-error2.ld65err-ref
similarity index 100%
rename from test/asm/listing/032-assert-error2.ld65err-ref
rename to test/asm/listing/ref/032-assert-error2.ld65err-ref
diff --git a/test/asm/listing/032-assert-error3.ld65err-ref b/test/asm/listing/ref/032-assert-error3.ld65err-ref
similarity index 100%
rename from test/asm/listing/032-assert-error3.ld65err-ref
rename to test/asm/listing/ref/032-assert-error3.ld65err-ref
diff --git a/test/asm/listing/100-byte.bin-ref b/test/asm/listing/ref/100-byte.bin-ref
similarity index 100%
rename from test/asm/listing/100-byte.bin-ref
rename to test/asm/listing/ref/100-byte.bin-ref
diff --git a/test/asm/listing/100-byte.list-ref b/test/asm/listing/ref/100-byte.list-ref
similarity index 100%
rename from test/asm/listing/100-byte.list-ref
rename to test/asm/listing/ref/100-byte.list-ref
diff --git a/test/asm/listing/101-byt.bin-ref b/test/asm/listing/ref/101-byt.bin-ref
similarity index 100%
rename from test/asm/listing/101-byt.bin-ref
rename to test/asm/listing/ref/101-byt.bin-ref
diff --git a/test/asm/listing/101-byt.list-ref b/test/asm/listing/ref/101-byt.list-ref
similarity index 100%
rename from test/asm/listing/101-byt.list-ref
rename to test/asm/listing/ref/101-byt.list-ref
diff --git a/test/asm/listing/102-word.bin-ref b/test/asm/listing/ref/102-word.bin-ref
similarity index 100%
rename from test/asm/listing/102-word.bin-ref
rename to test/asm/listing/ref/102-word.bin-ref
diff --git a/test/asm/listing/102-word.list-ref b/test/asm/listing/ref/102-word.list-ref
similarity index 100%
rename from test/asm/listing/102-word.list-ref
rename to test/asm/listing/ref/102-word.list-ref
diff --git a/test/asm/listing/103-dbyt.bin-ref b/test/asm/listing/ref/103-dbyt.bin-ref
similarity index 100%
rename from test/asm/listing/103-dbyt.bin-ref
rename to test/asm/listing/ref/103-dbyt.bin-ref
diff --git a/test/asm/listing/103-dbyt.list-ref b/test/asm/listing/ref/103-dbyt.list-ref
similarity index 100%
rename from test/asm/listing/103-dbyt.list-ref
rename to test/asm/listing/ref/103-dbyt.list-ref
diff --git a/test/asm/listing/104-dword.bin-ref b/test/asm/listing/ref/104-dword.bin-ref
similarity index 100%
rename from test/asm/listing/104-dword.bin-ref
rename to test/asm/listing/ref/104-dword.bin-ref
diff --git a/test/asm/listing/104-dword.list-ref b/test/asm/listing/ref/104-dword.list-ref
similarity index 100%
rename from test/asm/listing/104-dword.list-ref
rename to test/asm/listing/ref/104-dword.list-ref
diff --git a/test/asm/listing/105-faraddr.bin-ref b/test/asm/listing/ref/105-faraddr.bin-ref
similarity index 100%
rename from test/asm/listing/105-faraddr.bin-ref
rename to test/asm/listing/ref/105-faraddr.bin-ref
diff --git a/test/asm/listing/105-faraddr.list-ref b/test/asm/listing/ref/105-faraddr.list-ref
similarity index 100%
rename from test/asm/listing/105-faraddr.list-ref
rename to test/asm/listing/ref/105-faraddr.list-ref
diff --git a/test/asm/listing/106-hibytes.bin-ref b/test/asm/listing/ref/106-hibytes.bin-ref
similarity index 100%
rename from test/asm/listing/106-hibytes.bin-ref
rename to test/asm/listing/ref/106-hibytes.bin-ref
diff --git a/test/asm/listing/106-hibytes.list-ref b/test/asm/listing/ref/106-hibytes.list-ref
similarity index 100%
rename from test/asm/listing/106-hibytes.list-ref
rename to test/asm/listing/ref/106-hibytes.list-ref
diff --git a/test/asm/listing/107-lobytes.bin-ref b/test/asm/listing/ref/107-lobytes.bin-ref
similarity index 100%
rename from test/asm/listing/107-lobytes.bin-ref
rename to test/asm/listing/ref/107-lobytes.bin-ref
diff --git a/test/asm/listing/107-lobytes.list-ref b/test/asm/listing/ref/107-lobytes.list-ref
similarity index 100%
rename from test/asm/listing/107-lobytes.list-ref
rename to test/asm/listing/ref/107-lobytes.list-ref