diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el
index 0f5177b..0716b0d 100644
--- a/test/helpful-unit-test.el
+++ b/test/helpful-unit-test.el
@@ -734,7 +734,9 @@ associated a lambda with a keybinding."
   (should
    (equal
     (length (helpful--keymaps-containing #'helpful--dummy-command))
-    2))
+    (if (< emacs-major-version 30)
+        2
+      3)))
 
   ;; Undo keybinding.
   (global-set-key (kbd "C-c M-S-c") nil)
@@ -1089,8 +1089,12 @@ find the source code."
   (require 'xref)
   (helpful-function 'xref-location-marker)
   (should (s-contains-p "Implementations" (buffer-string)))
-  (should (s-contains-p "((l xref-file-location))" (buffer-string)))
-  (should (s-contains-p "((l xref-buffer-location))" (buffer-string))))
+  (should (if (version< emacs-version "29.1")
+	      (s-contains-p "((l xref-file-location))" (buffer-string))
+	    (s-contains-p "(xref-location-marker (L xref-file-location))" (buffer-string))))
+  (should (if (version< emacs-version "29.1")
+	      (s-contains-p "((l xref-buffer-location))" (buffer-string))
+	    (s-contains-p "(xref-location-marker (L xref-buffer-location))" (buffer-string)))))
 
 (defun helpful--boring-advice (orig-fn &rest args)
   (apply orig-fn args))