diff --git a/testcode/assembler/Makefile b/testcode/assembler/Makefile
new file mode 100644
index 000000000..6cb3fe1f2
--- /dev/null
+++ b/testcode/assembler/Makefile
@@ -0,0 +1,37 @@
+
+# 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
diff --git a/testcode/disasm/Makefile b/testcode/disasm/Makefile
new file mode 100644
index 000000000..05e5b8373
--- /dev/null
+++ b/testcode/disasm/Makefile
@@ -0,0 +1,58 @@
+# Sample makefile using a preprocessor against info files
+# and the --sync-lines option
+
+# 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
+  DA = $(CC65_HOME)/bin/da65
+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)
+  DA := $(if $(wildcard ../../../bin/da65*),../../../bin/da65,da65)
+endif
+
+CPP = env LANG=C cpp
+CPPFLAGS = # -DTEST_ERROR
+
+ASMS = fixed.s bank0.s bank1.s
+DAIS = fixed.dai bank0.dai bank1.dai
+
+.SUFFIXES: .da .dai .s
+.PHONY: all clean maintainer-clean
+.SECONDARY: $(DAIS)
+
+.da.dai:
+	$(CPP) -o $@ $(CPPFLAGS) $<
+
+.dai.s:
+	$(DA) --sync-lines -o $@ -i $< image.bin
+
+all: $(ASMS)
+
+clean:
+	$(RM) $(ASMS)
+
+maintainer-clean: clean
+	$(RM) $(DAIS)
+
+$(DAIS): fixed.da
diff --git a/testcode/disasm/sample-unix.mk b/testcode/disasm/sample-unix.mk
deleted file mode 100644
index 0ef64a5e5..000000000
--- a/testcode/disasm/sample-unix.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Sample makefile using a preprocessor against info files
-# and the --sync-lines option
-
-CPP = env LANG=C cpp
-CPPFLAGS = # -DTEST_ERROR
-
-ASMS = fixed.s bank0.s bank1.s
-DAIS = fixed.dai bank0.dai bank1.dai
-
-.SUFFIXES: .da .dai .s
-.PHONY: all clean maintainer-clean
-.SECONDARY: $(DAIS)
-
-.da.dai:
-	$(CPP) -o $@ $(CPPFLAGS) $<
-
-.dai.s:
-	da65 --sync-lines -o $@ -i $< image.bin
-
-all: $(ASMS)
-
-clean:
-	rm -f $(ASMS)
-
-maintainer-clean: clean
-	rm -f $(DAIS)
-
-$(DAIS): fixed.da