diff --git a/channeld/test/Makefile b/channeld/test/Makefile
index 4422b7ae5..69a8a0d69 100644
--- a/channeld/test/Makefile
+++ b/channeld/test/Makefile
@@ -5,6 +5,7 @@ CHANNELD_TEST_OBJS := $(CHANNELD_TEST_SRC:.c=.o)
 CHANNELD_TEST_PROGRAMS := $(CHANNELD_TEST_OBJS:.o=)
 
 ALL_TEST_PROGRAMS += $(CHANNELD_TEST_PROGRAMS)
+ALL_OBJS += $(CHANNELD_TEST_OBJS)
 
 CHANNELD_TEST_COMMON_OBJS :=			\
 	common/daemon_conn.o			\
@@ -19,6 +20,6 @@ update-mocks: $(CHANNELD_TEST_SRC:%=update-mocks/%)
 
 $(CHANNELD_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(LIBBASE58_OBJS) $(CHANNELD_TEST_COMMON_OBJS)
 
-$(CHANNELD_TEST_OBJS): $(CHANNELD_HEADERS) $(CHANNELD_SRC)
+$(CHANNELD_TEST_OBJS): $(LIGHTNING_CHANNELD_HEADERS) $(LIGHTNING_CHANNELD_SRC)
 
 check: $(CHANNELD_TEST_PROGRAMS:%=unittest/%)
diff --git a/gossipd/test/Makefile b/gossipd/test/Makefile
index 7f958392d..b55dc69f0 100644
--- a/gossipd/test/Makefile
+++ b/gossipd/test/Makefile
@@ -15,8 +15,8 @@ update-mocks: $(GOSSIPD_TEST_SRC:%=update-mocks/%)
 
 $(GOSSIPD_TEST_PROGRAMS): $(GOSSIPD_TEST_COMMON_OBJS) $(BITCOIN_OBJS)
 
-# Test objects require source to be generated, since they include ..
-$(GOSSIPD_TEST_OBJS): $(GOSSIPD_GEN_SRC) $(LIGHTNINGD_GOSSIP_SRC)
+# Test objects depend on ../ src and headers.
+$(GOSSIPD_TEST_OBJS): $(LIGHTNINGD_GOSSIP_HEADERS) $(LIGHTNINGD_GOSSIP_SRC)
 
 ALL_OBJS += $(GOSSIPD_TEST_OBJS)
 ALL_TEST_PROGRAMS += $(GOSSIPD_TEST_PROGRAMS)
diff --git a/lightningd/test/Makefile b/lightningd/test/Makefile
index ca5483198..c5c371fc4 100644
--- a/lightningd/test/Makefile
+++ b/lightningd/test/Makefile
@@ -5,6 +5,7 @@ LIGHTNINGD_TEST_OBJS := $(LIGHTNINGD_TEST_SRC:.c=.o)
 LIGHTNINGD_TEST_PROGRAMS := $(LIGHTNINGD_TEST_OBJS:.o=)
 
 ALL_TEST_PROGRAMS += $(LIGHTNINGD_TEST_PROGRAMS)
+ALL_OBJS += $(LIGHTNINGD_TEST_OBJS)
 
 LIGHTNINGD_TEST_COMMON_OBJS :=			\
 	common/daemon_conn.o			\
diff --git a/wire/test/Makefile b/wire/test/Makefile
index ac9d63d50..dcbf115e8 100644
--- a/wire/test/Makefile
+++ b/wire/test/Makefile
@@ -14,7 +14,7 @@ update-mocks: $(WIRE_TEST_SRC:%=update-mocks/%)
 $(WIRE_TEST_PROGRAMS): $(WIRE_TEST_COMMON_OBJS) $(BITCOIN_OBJS)
 
 # Test objects require source to be generated, since they include ..
-$(WIRE_TEST_OBJS): $(WIRE_GEN_SRC)
+$(WIRE_TEST_OBJS): $(WIRE_GEN_SRC) $(WIRE_SRC) $(WIRE_HEADERS)
 
 ALL_OBJS += $(WIRE_TEST_OBJS)
 ALL_TEST_PROGRAMS += $(WIRE_TEST_PROGRAMS)