diff --git a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
index 27eaae9f46..683b1819dc 100644
--- a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
+++ b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
@@ -1,4 +1,6 @@
 # BOARD DEFINE = {ARCH} : {MCU} :
+BOARD_USER = avr8 : at90usb1287 :
+BOARD_NONE = avr8 : at90usb1287 :
 BOARD_USBKEY = avr8 : at90usb1287 :
 BOARD_STK525 = avr8 : at90usb647 :
 BOARD_STK526 = avr8 : at90usb162 :
diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 5fffe1c1e1..598d953b6e 100644
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -30,6 +30,7 @@ makeboardlist:
 	
 testboards:
 	echo "buildtest:" > BuildMakefile
+	
 	@while read line; \
 	 do \
 	   build_cfg=`grep "$$line " BoardDeviceMap.cfg | sed 's/ //g' | cut -d'=' -f2-`; \
@@ -45,9 +46,10 @@ testboards:
 		 \
 		 printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \
 		 printf "\tmake -s -f makefile.%s clean\n" $$build_arch >> BuildMakefile; \
-		 printf "\tmake -s -f makefile.%s MCU=%s BOARD=%s\n\n" $$build_arch $$build_mcu $$build_board >> BuildMakefile; \
+		 printf "\tmake -s -f makefile.%s MCU=%s BOARD=%s elf\n\n" $$build_arch $$build_mcu $$build_board >> BuildMakefile; \
 	   fi; \
 	 done < BoardList.txt
+	 
 	 $(MAKE) -f BuildMakefile buildtest
 
 clean:
diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index c0d3ec040d..59700730cf 100644
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -37,21 +37,21 @@ end:
 	@echo
 
 %.avr8:
-	$(MAKE) -f makefile.avr8 clean -s
-	$(MAKE) -f makefile.avr8 all MCU=$(@:%.avr8=%) -s
+	$(MAKE) -s -f makefile.avr8 clean
+	$(MAKE) -s -f makefile.avr8 all MCU=$(@:%.avr8=%) elf
 
 %.xmega:
-	$(MAKE) -f makefile.xmega clean -s
-	$(MAKE) -f makefile.xmega all MCU=$(@:%.xmega=%) -s
+	$(MAKE) -s -f makefile.xmega clean
+	$(MAKE) -s -f makefile.xmega all MCU=$(@:%.xmega=%) elf
 
 %.uc3:
-	$(MAKE) -f makefile.uc3 clean -s
-	$(MAKE) -f makefile.uc3 all MCU=$(@:%.uc3=%) -s
+	$(MAKE) -s -f makefile.uc3 clean
+	$(MAKE) -s -f makefile.uc3 all MCU=$(@:%.uc3=%) elf
 
 clean:
-	$(MAKE) -f makefile.avr8 clean -s
-	$(MAKE) -f makefile.xmega clean -s
-	$(MAKE) -f makefile.uc3 clean -s
+	$(MAKE) -s -f makefile.avr8 clean
+	$(MAKE) -s -f makefile.xmega clean
+	$(MAKE) -s -f makefile.uc3 clean
 
 %:
 	
\ No newline at end of file
diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile
index 701a4b930d..725f4a50ec 100644
--- a/BuildTests/SingleUSBModeTest/makefile
+++ b/BuildTests/SingleUSBModeTest/makefile
@@ -23,23 +23,23 @@ end:
 	@echo
 
 compile:
-	$(MAKE) -f makefile.avr8 clean -s
-	$(MAKE) -f makefile.avr8 LUFA_OPTS='-D USB_DEVICE_ONLY' -s
-	$(MAKE) -f makefile.avr8 clean -s
-	$(MAKE) -f makefile.avr8 LUFA_OPTS='-D USB_HOST_ONLY' -s
-
-	$(MAKE) -f makefile.xmega clean -s
-	$(MAKE) -f makefile.xmega LUFA_OPTS='-D USB_DEVICE_ONLY' -s
-
-	$(MAKE) -f makefile.uc3 clean -s
-	$(MAKE) -f makefile.uc3 LUFA_OPTS='-D USB_DEVICE_ONLY' -s
-	$(MAKE) -f makefile.uc3 clean -s
-	$(MAKE) -f makefile.uc3 LUFA_OPTS='-D USB_HOST_ONLY' -s
+	$(MAKE) -s -f makefile.avr8 clean
+	$(MAKE) -s -f makefile.avr8 LUFA_OPTS='-D USB_DEVICE_ONLY' elf
+	$(MAKE) -s -f makefile.avr8 clean
+	$(MAKE) -s -f makefile.avr8 LUFA_OPTS='-D USB_HOST_ONLY' elf
+
+	$(MAKE) -s -f makefile.xmega clean
+	$(MAKE) -s -f makefile.xmega LUFA_OPTS='-D USB_DEVICE_ONLY' elf
+	
+	$(MAKE) -s -f makefile.uc3 clean
+	$(MAKE) -s -f makefile.uc3 LUFA_OPTS='-D USB_DEVICE_ONLY' elf
+	$(MAKE) -s -f makefile.uc3 clean
+	$(MAKE) -s -f makefile.uc3 LUFA_OPTS='-D USB_HOST_ONLY' elf
 
 clean:
-	$(MAKE) -f makefile.avr8 clean -s
-	$(MAKE) -f makefile.xmega clean -s
-	$(MAKE) -f makefile.uc3 clean -s
+	$(MAKE) -s -f makefile.avr8 clean
+	$(MAKE) -s -f makefile.xmega clean
+	$(MAKE) -s -f makefile.uc3 clean
 
 %:
 	
\ No newline at end of file
diff --git a/BuildTests/makefile b/BuildTests/makefile
index dfa4f8d4bd..ac0cde2603 100644
--- a/BuildTests/makefile
+++ b/BuildTests/makefile
@@ -11,13 +11,8 @@
 # not intended to be modified or compiled by non-developers.
 
 all:
-	$(MAKE) -C ModuleTest all
-	$(MAKE) -C SingleUSBModeTest all
-	$(MAKE) -C StaticAnalysisTest all
-	$(MAKE) -C BoardDriverTest all
-
 %:
+	$(MAKE) -C BoardDriverTest $@
 	$(MAKE) -C ModuleTest $@
 	$(MAKE) -C SingleUSBModeTest $@
 	$(MAKE) -C StaticAnalysisTest $@
-	$(MAKE) -C BoardDriverTest $@