diff --git a/host/Makefile b/host/Makefile
index dba6e9c..56962ee 100644
--- a/host/Makefile
+++ b/host/Makefile
@@ -1,26 +1,26 @@
-HOST_BINARY := host.prg
+HOST_NAME := host
+TEST_NAME := test
 
-BUILD_DIR := ./build
-
-BUILD_TYPE ?= release
-SRC_DIR := ./src
-
-
-HOST_PRG := $(BUILD_DIR)/$(HOST_BINARY)
-PREVIEW_PRG := $(BUILD_DIR)/$(PREVIEW_BINARY)
-
-SRCS := $(shell find $(SRC_DIR) -name '*.s' -or -name '*.inc')
 TOPLEVEL := source.s
+BUILD_TYPE ?= normal
 
 ifeq ($(BUILD_TYPE), test)
 	TOPLEVEL := test.s
+	HOST_NAME := $(TEST_NAME)
 endif
 
+HOST_BINARY := $(HOST_NAME).prg
 
+BUILD_DIR := ./build
+SRC_DIR := ./src
+
+HOST_PRG := $(BUILD_DIR)/$(HOST_BINARY)
+
+SRCS := $(shell find $(SRC_DIR) -name '*.s' -or -name '*.inc')
 
 CL := cl65
 
-CLFLAGS := -u __EXEHDR__ -t c64 -C c64-asm.cfg -l $(BUILD_DIR)/host.lst -Ln $(BUILD_DIR)/host.lbl
+CLFLAGS := -u __EXEHDR__ -t c64 -C c64-asm.cfg -l $(BUILD_DIR)/$(HOST_NAME).lst -Ln $(BUILD_DIR)/$(HOST_NAME).lbl
 
 $(HOST_PRG): $(SRCS) userprog.bin
 	mkdir -p $(BUILD_DIR)