diff --git a/Makefile.am b/Makefile.am
index 9d1ee3a..212a293 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,9 @@
 test_create_oversize_window_SOURCES = test/create_oversize_window.c \
 				      $(TEST_MBOX_SRCS) $(TEST_MOCK_SRCS)
 
+test_create_zero_size_window_SOURCES = test/create_zero_size_window.c \
+				       $(TEST_MBOX_SRCS) $(TEST_MOCK_SRCS)
+
 check_PROGRAMS = test/sanity \
 		 test/copy_flash \
 		 test/erase_flash \
@@ -73,6 +76,7 @@
 		 test/write_flush_v2 \
 		 test/mark_write_erased_v2 \
 		 test/bmc_event_ack_v2 \
-		 test/create_oversize_window
+		 test/create_oversize_window \
+		 test/create_zero_size_window
 
 TESTS = $(check_PROGRAMS)