diff --git a/BuildTests/ModuleTest/makefile.test b/BuildTests/ModuleTest/makefile.test
index 1ea9173ed9..55f3941bfc 100644
--- a/BuildTests/ModuleTest/makefile.test
+++ b/BuildTests/ModuleTest/makefile.test
@@ -22,11 +22,11 @@ LUFA_PATH    = ../../LUFA
 DEBUG_LEVEL  = 0 
 
 ifeq ($(ARCH), AVR8)
-F_USB        = 8000000
+  F_USB        = 8000000
 else ifeq ($(ARCH), XMEGA)
-F_USB        = 48000000
+  F_USB        = 48000000
 else ifeq ($(ARCH), UC3)
-F_USB        = 48000000
+  F_USB        = 48000000
 endif
 
 # Generic C/C++ compiler flags
@@ -46,21 +46,39 @@ CC_FLAGS += -Wmissing-field-initializers
 CC_FLAGS += -Wmissing-format-attribute
 CC_FLAGS += -Woverlength-strings
 CC_FLAGS += -Wswitch-default
+CC_FLAGS += -Wfloat-equal
+CC_FLAGS += -Waggregate-return
+CC_FLAGS += -Wmissing-include-dirs
+
+# Disable warnings not supported by the version of GCC used for UC3 targets (FIXME)
+ifneq ($(ARCH), UC3)
+  CC_FLAGS += -Wdouble-promotion
+endif
 
 # Only enable rendundant declaration warnings for AVR8 target (FIXME)
 ifeq ($(ARCH), AVR8)
-CC_FLAGS += -Wredundant-decls
+  CC_FLAGS += -Wredundant-decls
 endif
 
 # C compiler only flags
 C_FLAGS += -Wmissing-parameter-type
+C_FLAGS += -Wmissing-prototypes
 C_FLAGS += -Wnested-externs
+C_FLAGS += -Wbad-function-cast
+C_FLAGS += -Wstrict-prototypes
+C_FLAGS += -Wold-style-definition
+
+# Disable warnings not supported by the version of GCC used for UC3 targets (FIXME)
+ifneq ($(ARCH), UC3)
+  C_FLAGS += -Wunsuffixed-float-constants
+  C_FLAGS += -Wjump-misses-init
+endif
 
 # Potential additional warnings to enable in the future (FIXME)
-#CC_FLAGS += -Wc++-compat
+#C_FLAGS += -Wc++-compat
 #CC_FLAGS += -Wcast-qual
 #CC_FLAGS += -Wconversion
-#CC_FLAGS += -Wjump-misses-init
+#CC_FLAGS += -Wsign-conversion
 #CC_FLAGS += -pedantic
 
 # Include LUFA build script makefiles