diff --git a/handshaked/Makefile b/handshaked/Makefile
index 411dd1089..5fc672f0a 100644
--- a/handshaked/Makefile
+++ b/handshaked/Makefile
@@ -55,7 +55,7 @@ handshaked/gen_handshake_wire.c: $(WIRE_GEN) handshaked/handshake_wire.csv
 
 LIGHTNINGD_HANDSHAKE_OBJS := $(LIGHTNINGD_HANDSHAKE_SRC:.c=.o) $(LIGHTNINGD_HANDSHAKE_GEN_SRC:.c=.o)
 
-lightningd/lightning_handshaked: $(LIGHTNINGD_OLD_LIB_OBJS) $(LIGHTNINGD_LIB_OBJS) $(LIGHTNINGD_HANDSHAKE_OBJS) $(HANDSHAKED_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(LIGHTNINGD_HSM_CLIENT_OBJS)
+lightningd/lightning_handshaked: $(LIGHTNINGD_LIB_OBJS) $(LIGHTNINGD_HANDSHAKE_OBJS) $(HANDSHAKED_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(LIGHTNINGD_HSM_CLIENT_OBJS)
 
 check-source: $(LIGHTNINGD_HANDSHAKE_SRC_NOGEN:%=check-src-include-order/%)
 check-source-bolt: $(LIGHTNINGD_HANDSHAKE_SRC:%=bolt-check/%) $(LIGHTNINGD_HANDSHAKE_HEADERS:%=bolt-check/%)
diff --git a/lightningd/test/Makefile b/lightningd/test/Makefile
index cad50efdd..ca5483198 100644
--- a/lightningd/test/Makefile
+++ b/lightningd/test/Makefile
@@ -1,5 +1,3 @@
-check: lightningd/tests
-
 # Note that these actually #include everything they need, except ccan/ and bitcoin/.
 # That allows for unit testing of statics, and special effects.
 LIGHTNINGD_TEST_SRC := $(wildcard lightningd/test/run-*.c)
@@ -19,11 +17,8 @@ LIGHTNINGD_TEST_COMMON_OBJS :=			\
 
 update-mocks: $(LIGHTNINGD_TEST_SRC:%=update-mocks/%)
 
-$(LIGHTNINGD_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(LIBBASE58_OBJS) $(LIGHTNINGD_OLD_LIB_OBJS) $(LIGHTNINGD_TEST_COMMON_OBJS)
+$(LIGHTNINGD_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(LIBBASE58_OBJS) $(LIGHTNINGD_TEST_COMMON_OBJS)
 
 $(LIGHTNINGD_TEST_OBJS): $(LIGHTNINGD_HEADERS) $(LIGHTNINGD_SRC)
 
-lightningd/tests: $(LIGHTNINGD_TEST_PROGRAMS:%=unittest/%)
-
-check-source-bolt: $(LIGHTNINGD_TEST_SRC:%=bolt-check/%)
-check-whitespace: $(LIGHTNINGD_TEST_SRC:%=check-whitespace/%)
+check: $(LIGHTNINGD_TEST_PROGRAMS:%=unittest/%)