diff --git a/targettest/Makefile b/targettest/Makefile
index 38b44035e..2b9732c67 100644
--- a/targettest/Makefile
+++ b/targettest/Makefile
@@ -55,6 +55,9 @@ ifdef QUIET
     .SILENT:
     PQ = "QUIET=1"
     PD = --no-print-directory
+ifndef CMD_EXE
+  CATERR = 2> $$@.errlog || (cat $$@.errlog && false)
+endif
 endif
 
 ifneq ($(filter disk testcode.%,$(MAKECMDGOALS)),)
@@ -131,12 +134,12 @@ DISK_atarixl   = testcode.atr
 
 .c.o:
 	$(if $(QUIET),echo $(SYS):$*.c)
-	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $<
-	$(AS) $(<:.c=.s)
+	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $< $(CATERR)
+	$(AS) $(<:.c=.s) $(CATERR)
 
 .s.o:
 	$(if $(QUIET),echo $(SYS):$*.s)
-	$(AS) $(ASFLAGS) -t $(SYS) $<
+	$(AS) $(ASFLAGS) -t $(SYS) $< $(CATERR)
 
 .PRECIOUS: %.o
 
diff --git a/test/asm/cpudetect/Makefile b/test/asm/cpudetect/Makefile
index d0077bfd9..27724b9f9 100644
--- a/test/asm/cpudetect/Makefile
+++ b/test/asm/cpudetect/Makefile
@@ -20,6 +20,9 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
 
 ifdef QUIET
   .SILENT:
diff --git a/test/asm/err/Makefile b/test/asm/err/Makefile
index 8b93cd80d..9b6bc7fa9 100644
--- a/test/asm/err/Makefile
+++ b/test/asm/err/Makefile
@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/asm/listing/Makefile b/test/asm/listing/Makefile
index dc2c43d73..202a44011 100644
--- a/test/asm/listing/Makefile
+++ b/test/asm/listing/Makefile
@@ -28,6 +28,10 @@ else
   NULLDEV = /dev/null
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/asm/misc/Makefile b/test/asm/misc/Makefile
index 3072fa24e..713d57812 100644
--- a/test/asm/misc/Makefile
+++ b/test/asm/misc/Makefile
@@ -26,6 +26,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/asm/opcodes/Makefile b/test/asm/opcodes/Makefile
index 2fe046bd9..e9978ee95 100644
--- a/test/asm/opcodes/Makefile
+++ b/test/asm/opcodes/Makefile
@@ -20,6 +20,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/asm/val/Makefile b/test/asm/val/Makefile
index fe27f97d1..41df980a9 100644
--- a/test/asm/val/Makefile
+++ b/test/asm/val/Makefile
@@ -22,6 +22,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/dasm/Makefile b/test/dasm/Makefile
index 196975857..b86a75416 100644
--- a/test/dasm/Makefile
+++ b/test/dasm/Makefile
@@ -22,6 +22,10 @@ else
   NULLDEV = /dev/null
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/err/Makefile b/test/err/Makefile
index 5bd198477..60780d27b 100644
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/misc/Makefile b/test/misc/Makefile
index 8eb360e52..6a5611c68 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -26,6 +26,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/ref/Makefile b/test/ref/Makefile
index 1a5611083..4269c3879 100644
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -27,6 +27,10 @@ else
   COPY = cp $1 $2
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/standard/Makefile b/test/standard/Makefile
index f09024b58..903b34221 100644
--- a/test/standard/Makefile
+++ b/test/standard/Makefile
@@ -22,6 +22,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/standard_err/Makefile b/test/standard_err/Makefile
index 702ad3f95..989d26d6f 100644
--- a/test/standard_err/Makefile
+++ b/test/standard_err/Makefile
@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/todo/Makefile b/test/todo/Makefile
index 7a0cbfa54..efaca3a25 100644
--- a/test/todo/Makefile
+++ b/test/todo/Makefile
@@ -24,6 +24,10 @@ else
   RMDIR = $(RM) -r $1
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)
diff --git a/test/val/Makefile b/test/val/Makefile
index 1f6f0ba4c..13b4ca4bd 100644
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -24,6 +24,10 @@ else
   CATRES = > $(WORKDIR)/$$@.out 2> $(WORKDIR)/$$@.out || (cat $(WORKDIR)/$$@.out && false)
 endif
 
+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
   .SILENT:
   NULLOUT = >$(NULLDEV)