diff --git a/Makefile.am b/Makefile.am
index be269bda9c85f1506b63c3f4ebbeb7c53bb38a77..f1eba2d96d5027107e3393d4094d98eb08913c08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -681,8 +681,9 @@ apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES)
 .PHONY: TAGS
 TAGS: $(BUILT_SOURCES)
 	rm -f TAGS
-	find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
-	  -path 'daemons/ganeti-*' -o -path 'tools/*' | \
+	find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
+	  -path './daemons/ganeti-*' -o -path './tools/*' -o \
+	  -path './qa/*.py' | \
 	  etags -
 
 .PHONY: coverage