diff --git a/Makefile b/Makefile
index 54f7edcf04..9d01347989 100644
--- a/Makefile
+++ b/Makefile
@@ -85,9 +85,12 @@ endif
 	mkdir -p build
 	touch $@
 
-oldtest: | nvim
+oldtest: | nvim tags
 	+$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)
 
+tags: | nvim
+	+$(BUILD_CMD) -C build runtime/doc/tags
+
 functionaltest: | nvim
 	+$(BUILD_CMD) -C build functionaltest