diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 97613f34a1b..a49dded5b7d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-13  Tom Tromey  <tom@tromey.com>
+
+	* Makefile.in (TAGS): Recognize proc_with_prefix and
+	gdb_caching_proc.
+
 2018-09-13  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* gdb.python/py-progspace.exp: Test the Progspace.objfiles
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index e7be686406b..ece7e252c51 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -348,7 +348,9 @@ config.status: configure
 
 TAGS: force
 	find $(srcdir) -name '*.exp' -print | \
-	    etags --regex='/proc[ \t]+\([^ \t]+\)/\1/' -
+	    etags \
+		--regex='/\(proc\|proc_with_prefix\|gdb_caching_proc\)[ \t]+\([^ \t]+\)/\2/' \
+		-
 
 # Build the expect wrapper script that preloads the read1.so library.
 expect-read1: