diff --git a/lisp/net/tramp-message.el b/lisp/net/tramp-message.el
index fe7758bdb08..7b405061ba8 100644
--- a/lisp/net/tramp-message.el
+++ b/lisp/net/tramp-message.el
@@ -240,8 +240,10 @@ ARGUMENTS to actually emit the message (if applicable)."
 	    (dolist
 		(elt
 		 (append
-		  (mapcar
-		   #'intern (all-completions "tramp-" obarray #'functionp))
+		  (apropos-internal (rx bos "tramp-") #'functionp)
+		  (apropos-internal (rx bos "tramp-") #'macrop)
+		  (apropos-internal
+		   (rx bos "with-" (? "parsed-") "tramp-") #'macrop)
 		  tramp-trace-functions))
 	      (unless (get elt 'tramp-suppress-trace)
 		(trace-function-background elt (tramp-trace-buffer-name vec)))))