diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 1d1be8687cfb730b72b621d965692c301de934fc..252b3f880c7b2aeb15ac7ff6ec613df6dcda2cc2 100644
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -59,4 +59,8 @@ clean:
 	$(MAKE) -s -f makefile.test clean ARCH=UC3
 
 %:
-	
\ No newline at end of file
+
+.PHONY: all begin end makeboardlist testboards clean
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 08b7590b3f5ad73db242d5ea95c4699a5d1d57e3..635c5c690008882d680d5c614399b503c8119d82 100644
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -54,4 +54,8 @@ clean:
 	rm -f BuildMakefile
 
 %:
-	
\ No newline at end of file
+
+.PHONY: all begin end testbootloaders clean
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index 170c9301422e2d861dcc7032880d26771dfef4b1..6cdd575b081ed16a1270bbddaa71136916e52d66 100644
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -51,4 +51,8 @@ clean:
 	$(MAKE) -s -f makefile.test clean ARCH=UC3
 
 %:
-	
\ No newline at end of file
+
+.PHONY: all arch_avr8 arch_xmega arch_uc3 begin end
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile
index 93027d9805bcfd07e231fb6ac79c891de601dbaf..98e2d25f32969be15143aefb13cf58894ba2d2fa 100644
--- a/BuildTests/SingleUSBModeTest/makefile
+++ b/BuildTests/SingleUSBModeTest/makefile
@@ -37,4 +37,8 @@ clean:
 	$(MAKE) -s -f makefile.test clean ARCH=UC3
 
 %:
-	
\ No newline at end of file
+
+.PHONY: begin end compile clean
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
index 1578412f9ebcab26f3a44c2c8db27c418dbbdca5..6f138af8925adc6cc82079ac908ff7d9d672c70c 100644
--- a/BuildTests/StaticAnalysisTest/makefile
+++ b/BuildTests/StaticAnalysisTest/makefile
@@ -8,30 +8,16 @@
 
 # Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.
 
-# Path to the root of the LUFA tree to scan
-LUFA_ROOT_PATH    = ../..
+LUFA_ROOT_PATH = ../..
 
-# Filenames or directories (including fragments) to exclude from the analysis
-EXCLUDE_LIST      = FATFs/            \
+CPPCHECK_EXCLUDES = FATFs/            \
                     PetiteFATFs/      \
                     uip/
+CPPCHECK_INCLUDES = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/   \
+                    $(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/
+CPPCHECK_PATH     = $(LUFA_ROOT_PATH)
 
-# Output message template for found warnings and errors
-MESSAGE_TEMPLATE  = "{file}:{line}: {severity} ({id}): {message}"
-
-# Checks to suppress so that generated warnings are discarded
-SUPPRESS_WARNINGS = variableScope     \
-                    missingInclude
-
-# Extra paths to search for include files
-INCLUDE_PATHS     = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/      \
-					$(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/
-
-# Configuration options to pass to cppcheck
-CPPCHECK_OPTIONS  = --template=$(MESSAGE_TEMPLATE) $(INCLUDE_PATHS:%=-I%) $(EXCLUDE_LIST:%=-i%) --inline-suppr --force --error-exitcode=1 --std=c99
-
-
-all: begin staticcheck end
+all: begin cppcheck-config cppcheck end
 
 begin:
 	@echo Executing build test "StaticAnalysisTest".
@@ -41,9 +27,10 @@ end:
 	@echo Build test "StaticAnalysisTest" complete.
 	@echo
 
-staticcheck:
-	cppcheck --quiet $(CPPCHECK_OPTIONS) --check-config $(LUFA_ROOT_PATH)
-	cppcheck --quiet $(CPPCHECK_OPTIONS) --enable=all $(SUPPRESS_WARNINGS:%=--suppress=%) $(LUFA_ROOT_PATH)
-
 %:
-	
\ No newline at end of file
+
+.PHONY: all begin end
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.cppcheck.in
\ No newline at end of file