diff --git a/test/Makefile b/test/Makefile
index c85883517..fc1ac246c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -16,8 +16,6 @@ WORKDIR = ../testwrk
 
 all: dotests
 
-.NOTPARALLEL:
-
 dotests: mostlyclean continue
 
 continue:
diff --git a/test/asm/Makefile b/test/asm/Makefile
index 93210aaee..62f2f8dd1 100644
--- a/test/asm/Makefile
+++ b/test/asm/Makefile
@@ -41,6 +41,9 @@ CPUDETECT_BINS = $(foreach cpu,$(CPUDETECT_CPUS),$(WORKDIR)/$(cpu)-cpudetect.bin
 
 all: $(OPCODE_BINS) $(CPUDETECT_BINS)
 
+# cpudetect.o is written by multiple rules
+.NOTPARALLEL:
+
 $(WORKDIR):
 	$(call MKDIR,$(WORKDIR))
 
diff --git a/test/misc/Makefile b/test/misc/Makefile
index 15999ba3c..1d6b2b9d2 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -69,13 +69,13 @@ $(WORKDIR)/endless.$1.$2.prg: endless.c | $(WORKDIR)
 $(WORKDIR)/limits.$1.$2.prg: limits.c $(DIFF)
 	$(if $(QUIET),echo misc/limits.$1.$2.prg)
 	$(CL65) -t sim$2 -$1 -o $$@ $$< $(NULLERR)
-	$(SIM65) $(SIM65FLAGS) $$@ > $(WORKDIR)/limits.$1.out
-	$(DIFF) $(WORKDIR)/limits.$1.out limits.ref
+	$(SIM65) $(SIM65FLAGS) $$@ > $(WORKDIR)/limits.$1.$2.out
+	$(DIFF) $(WORKDIR)/limits.$1.$2.out limits.ref
 
 $(WORKDIR)/goto.$1.$2.prg: goto.c $(DIFF)
 	$(if $(QUIET),echo misc/goto.$1.$2.prg)
-	$(CL65) -t sim$2 -$1 -o $$@ $$< 2>$(WORKDIR)/goto.$1.out
-	$(DIFF) $(WORKDIR)/goto.$1.out goto.ref
+	$(CL65) -t sim$2 -$1 -o $$@ $$< 2>$(WORKDIR)/goto.$1.$2.out
+	$(DIFF) $(WORKDIR)/goto.$1.$2.out goto.ref
 
 # the rest are tests that fail currently for one reason or another
 $(WORKDIR)/fields.$1.$2.prg: fields.c | $(WORKDIR)