diff --git a/test/asm/Makefile b/test/asm/Makefile
index b157bb672..028254b68 100644
--- a/test/asm/Makefile
+++ b/test/asm/Makefile
@@ -38,7 +38,7 @@ CPUDETECT_REFS := $(wildcard *-cpudetect.ref)
 CPUDETECT_CPUS = $(foreach ref,$(CPUDETECT_REFS),$(ref:%-cpudetect.ref=%))
 CPUDETECT_BINS = $(foreach cpu,$(CPUDETECT_CPUS),$(WORKDIR)/$(cpu)-cpudetect.bin)
 
-all: $(OPCODE_BINS) $(CPUDETECT_BINS)
+all: $(OPCODE_BINS) $(CPUDETECT_BINS) paramcount.o
 
 $(WORKDIR):
 	$(call MKDIR,$(WORKDIR))
@@ -70,5 +70,8 @@ endef # CPUDETECT_template
 
 $(foreach cpu,$(CPUDETECT_CPUS),$(eval $(call CPUDETECT_template,$(cpu))))
 
+paramcount.o: paramcount.s
+	$(CA65) -o $(WORKDIR)/paramcount.o -l $(WORKDIR)/paramcount.lst paramcount.s
+
 clean:
 	@$(call RMDIR,$(WORKDIR))
diff --git a/testcode/assembler/paramcount.s b/test/asm/paramcount.s
similarity index 100%
rename from testcode/assembler/paramcount.s
rename to test/asm/paramcount.s
diff --git a/test/asm/README b/test/asm/readme.txt
similarity index 100%
rename from test/asm/README
rename to test/asm/readme.txt
diff --git a/testcode/assembler/Makefile b/testcode/assembler/Makefile
deleted file mode 100644
index 6cb3fe1f2..000000000
--- a/testcode/assembler/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# Just the usual way to find out if we're
-# using cmd.exe to execute make rules.
-ifneq ($(shell echo),)
-  CMD_EXE = 1
-endif
-
-ifdef CMD_EXE
-  NULLDEV = nul:
-  DEL = -del /f
-  RMDIR = rmdir /s /q
-else
-  NULLDEV = /dev/null
-  DEL = $(RM)
-  RMDIR = $(RM) -r
-endif
-
-ifdef CC65_HOME
-  AS = $(CC65_HOME)/bin/ca65
-  CC = $(CC65_HOME)/bin/cc65
-  CL = $(CC65_HOME)/bin/cl65
-  LD = $(CC65_HOME)/bin/ld65
-else
-  AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65)
-  CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65)
-  CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65)
-  LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65)
-endif
-
-all: paramcount.o
-
-paramcount.o: paramcount.s
-	$(AS) -o paramcount.o -l paramcount.lst paramcount.s
-	
-clean:
-	$(RM) paramcount.o
-	$(RM) paramcount.lst