diff --git a/Makefile.am b/Makefile.am
index 2f1d5fb..0c055a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,16 @@
 
 test_write_flash_SOURCES = test/write_flash.c mboxd_flash.c common.c test/tmpf.c
 
+TEST_MBOX_SRCS = mboxd_msg.c mboxd_windows.c mboxd_lpc.c mboxd_flash.c common.c
+TEST_MOCK_SRCS = test/tmpf.c test/mbox.c test/system.c
+
+test_get_mbox_info_v2_SOURCES = test/get_mbox_info_v2.c \
+				$(TEST_MBOX_SRCS) $(TEST_MOCK_SRCS)
+
 check_PROGRAMS = test/sanity \
-		test/copy_flash \
-		test/erase_flash \
-		test/write_flash
+		 test/copy_flash \
+		 test/erase_flash \
+		 test/write_flash \
+		 test/get_mbox_info_v2
 
 TESTS = $(check_PROGRAMS)