diff --git a/wallet/Makefile b/wallet/Makefile
index 6c66fbb4d..f3347f201 100644
--- a/wallet/Makefile
+++ b/wallet/Makefile
@@ -4,8 +4,6 @@
 wallet-wrongdir:
 	$(MAKE) -C .. lightningd-all
 
-check: wallet/tests
-
 WALLET_LIB_SRC :=		\
 	wallet/db.c		\
 	wallet/wallet.c		\
@@ -14,30 +12,11 @@ WALLET_LIB_SRC :=		\
 WALLET_LIB_OBJS := $(WALLET_LIB_SRC:.c=.o)
 WALLET_LIB_HEADERS := $(WALLET_LIB_SRC:.c=.h)
 
-WALLET_TEST_COMMON_OBJS :=			\
-	common/htlc_state.o			\
-	common/type_to_string.o			\
-	common/pseudorand.o			\
-	common/utils.o				\
-	lightningd/htlc_end.o			\
-	lightningd/log.o
-
-WALLET_TEST_SRC := $(wildcard wallet/*_tests.c)
-WALLET_TEST_OBJS := $(WALLET_TEST_SRC:.c=.o)
-WALLET_TEST_PROGRAMS := $(WALLET_TEST_OBJS:.o=)
-
-# Make sure these depend on everything.
-ALL_TEST_PROGRAMS += $(WALLET_TEST_PROGRAMS)
-ALL_OBJS += $(WALLET_LIB_OBJS) $(WALLET_TEST_OBJS)
-
-$(WALLET_TEST_PROGRAMS): $(BITCOIN_OBJS) $(WALLET_TEST_COMMON_OBJS)
-$(WALLET_TEST_OBJS): $(WALLET_LIB_HEADERS)
-
-wallet/tests: $(WALLET_TEST_PROGRAMS:%=unittest/%)
-
 check-whitespace: $(WALLET_LIB_SRC:%=check-whitespace/%) $(WALLET_LIB_HEADERS:%=check-whitespace/%)
 
 clean: wallet-clean
 
 wallet-clean:
 	$(RM) $(WALLET_LIB_OBJS)
+
+include wallet/test/Makefile
diff --git a/wallet/test/.gitignore b/wallet/test/.gitignore
new file mode 100644
index 000000000..e2453faf8
--- /dev/null
+++ b/wallet/test/.gitignore
@@ -0,0 +1,2 @@
+run-db
+run-wallet
diff --git a/wallet/test/Makefile b/wallet/test/Makefile
new file mode 100644
index 000000000..bde8a35b6
--- /dev/null
+++ b/wallet/test/Makefile
@@ -0,0 +1,27 @@
+WALLET_TEST_SRC := $(wildcard wallet/test/run-*.c)
+WALLET_TEST_OBJS := $(WALLET_TEST_SRC:.c=.o)
+WALLET_TEST_PROGRAMS := $(WALLET_TEST_OBJS:.o=)
+
+WALLET_TEST_COMMON_OBJS :=				\
+	common/htlc_state.o			\
+	common/type_to_string.o			\
+	common/pseudorand.o			\
+	common/utils.o				\
+	lightningd/htlc_end.o			\
+	lightningd/log.o
+
+# Make sure these depend on everything.
+ALL_TEST_PROGRAMS += $(WALLET_TEST_PROGRAMS)
+ALL_OBJS += $(WALLET_LIB_OBJS) $(WALLET_TEST_OBJS)
+
+$(WALLET_TEST_PROGRAMS): $(BITCOIN_OBJS) $(WALLET_TEST_COMMON_OBJS)
+$(WALLET_TEST_OBJS): $(WALLET_LIB_HEADERS)
+
+wallet/tests: $(WALLET_TEST_PROGRAMS:%=unittest/%)
+
+$(WALLET_TEST_PROGRAMS): $(WALLET_TEST_COMMON_OBJS) $(BITCOIN_OBJS)
+$(WALLET_TEST_OBJS): $(WALLET_SRC)
+
+update-mocks: $(WALLET_TEST_SRC:%=update-mocks/%)
+
+check: $(WALLET_TEST_PROGRAMS:%=unittest/%)
diff --git a/wallet/db_tests.c b/wallet/test/run-db.c
similarity index 97%
rename from wallet/db_tests.c
rename to wallet/test/run-db.c
index 2df08caf9..f44a44eb8 100644
--- a/wallet/db_tests.c
+++ b/wallet/test/run-db.c
@@ -3,9 +3,9 @@
 static void db_fatal(const char *fmt, ...);
 #define fatal db_fatal
 
-#include "db.c"
+#include "wallet/db.c"
 
-#include "wallet/test_utils.h"
+#include "test_utils.h"
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/wallet/wallet_tests.c b/wallet/test/run-wallet.c
similarity index 99%
rename from wallet/wallet_tests.c
rename to wallet/test/run-wallet.c
index 6d1179c42..e4656dc9e 100644
--- a/wallet/wallet_tests.c
+++ b/wallet/test/run-wallet.c
@@ -2,17 +2,17 @@
 
 static void wallet_fatal(const char *fmt, ...);
 #define fatal wallet_fatal
+#include "test_utils.h"
 
-#include "wallet.c"
+#include "wallet/wallet.c"
 
-#include "db.c"
+#include "wallet/db.c"
 
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <wallet/test_utils.h>
 
 static char *wallet_err;
 static void wallet_fatal(const char *fmt, ...)
diff --git a/wallet/test_utils.h b/wallet/test/test_utils.h
similarity index 100%
rename from wallet/test_utils.h
rename to wallet/test/test_utils.h