diff --git a/board/Makefile.board b/board/Makefile.board
index bcc333625..427632085 100644
--- a/board/Makefile.board
+++ b/board/Makefile.board
@@ -1,7 +1,15 @@
+BOARDS = redbee-dev redbee-module redbee-r1 redbee-usb redbee-econotag
+
 CFLAGS += -I obj_$(BOARD)_board
 OBJDIR = obj_$(BOARD)_board
 
 board:
+ifndef BOARD
+	${warning BOARD not defined}
+	${warning echo "make BOARD=foo"}
+	${warning "boards: $(BOARDS)"}
+	${error you must define BOARD}
+endif
 	@echo "setup object directory for dev board"
 	mkdir -p $(OBJDIR)
-	cp $(MC1322X)/board/$(BOARD).h $(OBJDIR)
\ No newline at end of file
+	cp $(MC1322X)/board/$(BOARD).h $(OBJDIR)
diff --git a/tests/Makefile b/tests/Makefile
index b360356f6..d9bfdc1bc 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,4 +2,5 @@ MC1322X = ..
 
 include $(MC1322X)/Makefile.include
 
-all: blink-red
\ No newline at end of file
+all: board blink-red_$(BOARD).elf
+