diff --git a/tests/Makefile b/tests/Makefile
index 4f626ee..dabee06 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,7 +11,7 @@ AR       = msp430-ar
 OBJCOPY  = msp430-objcopy
 STRIP    = msp430-strip
 BSL      = msp430-bsl
-CFLAGSNO = -I. -Wall -mmcu=$(MCU) -g
+CFLAGSNO = -I. -Wall -mmcu=$(MCU) -g -gstabs+
 CFLAGS  += $(CFLAGSNO) -Os
 
 SOURCES := msp430setup.c
@@ -23,7 +23,7 @@ all:	cputest.firmware timertest.firmware
 
 
 %.firmware:	%.o $(OBJECTS)
-	$(CC) -mmcu=$(MCU) -Wl,-Map=$(@:.firmware=.map) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) -Wl,-Map=$(@:.firmware=.map) -o $@ $^
 
 %.ihex: %.firmware
 	$(OBJCOPY) $^ -O ihex $@