diff --git a/Makefile b/Makefile
index 75e6819ea..b3063fe33 100644
--- a/Makefile
+++ b/Makefile
@@ -256,8 +256,9 @@ check-source: check-makefile check-source-bolt check-whitespace	\
 
 full-check: check $(TEST_PROGRAMS) check-source
 
+# Ignore test/ directories.
 TAGS: FORCE
-	$(RM) TAGS; find * -name '*.[ch]' | xargs etags --append
+	$(RM) TAGS; find * -name test -type d -prune -o -name '*.[ch]' -print | xargs etags --append
 FORCE::
 
 ccan/ccan/cdump/tools/cdump-enumstr: ccan/ccan/cdump/tools/cdump-enumstr.o $(CDUMP_OBJS) $(CCAN_OBJS)