4 files changed, 12 insertions, 9 deletions

diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
index 4864fc488e2..54d85ee95f9 100644
--- a/test/lisp/net/shr-tests.el
+++ b/test/lisp/net/shr-tests.el
@@ -136,13 +136,15 @@ settings, then once more for each (OPTION . VALUE) pair.")
 (ert-deftest shr-test/zoom-image ()
   "Test that `shr-zoom-image' properly replaces the original image."
   (skip-unless (bound-and-true-p image-types))
-  (let ((image (expand-file-name "data/image/blank-100x200.png"
-                                 (getenv "EMACS_TEST_DIRECTORY"))))
+  (let* ((image (expand-file-name "data/image/blank-100x200.png"
+                                  (getenv "EMACS_TEST_DIRECTORY")))
+         (image-url (concat "file://" (if (string-prefix-p "/" image)
+                                          image (concat "/" image)))))
     (dolist (alt '(nil "" "nothing to see here"))
       (with-temp-buffer
         (ert-info ((format "image with alt=%S" alt))
           (let ((attrs (if alt (format " alt=\"%s\"" alt) "")))
-            (insert (format "<img src=\"file://%s\" %s" image attrs)))
+            (insert (format "<img src=\"%s\" %s" image-url attrs)))
           (cl-letf* (;; Pretend we're a graphical display.
                      ((symbol-function 'display-graphic-p) #'always)
                      ((symbol-function 'url-queue-retrieve)
@@ -161,11 +163,13 @@ settings, then once more for each (OPTION . VALUE) pair.")
             ;; Render the document.
             (erase-buffer)
             (shr-insert-document dom)
-            (shr-test-wait-for (lambda () (= put-image-calls 1)))
+            (shr-test-wait-for (lambda () (= put-image-calls 1))
+                               "Timed out waiting for initial load")
             ;; Now zoom the image.
             (goto-char (point-min))
             (shr-zoom-image)
-            (shr-test-wait-for (lambda () (= put-image-calls 2)))
+            (shr-test-wait-for (lambda () (= put-image-calls 2))
+                               "Timed out waiting to zoom image")
             ;; Check that we got a sliced image.
             (let ((slice-count 0))
               (goto-char (point-min))
diff --git a/test/lisp/which-key-tests.el b/test/lisp/which-key-tests.el
index 1f2b1965ec3..3b42a7bd504 100644
--- a/test/lisp/which-key-tests.el
+++ b/test/lisp/which-key-tests.el
@@ -53,8 +53,7 @@
              '(("C-a" . "which-key-test--named-map"))))))
 
 (ert-deftest which-key-test--prefix-declaration ()
-  "Test `which-key-declare-prefixes' and
-`which-key-declare-prefixes-for-mode'. See Bug #109."
+  ;; See Bug #109.
   (let* ((major-mode 'test-mode)
          which-key-replacement-alist)
     (which-key-add-key-based-replacements
diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el
index 54f339f6373..084fcd8c9db 100644
--- a/test/src/comp-resources/comp-test-funcs.el
+++ b/test/src/comp-resources/comp-test-funcs.el
@@ -361,7 +361,7 @@
        2))
 
 (defun comp-test-copy-insn-f (insn)
-  ;; From `comp-copy-insn'.
+  ;; From `comp--copy-insn'.
   (if (consp insn)
       (let (result)
         (while (consp insn)
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index dffb7097a3e..6744f14435b 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -1320,7 +1320,7 @@ Return a list of results."
            (5 (message "five")))
          x)
        't
-       ;; FIXME improve `comp-cond-cstrs-target-mvar' to cross block
+       ;; FIXME improve `comp--cond-cstrs-target-mvar' to cross block
        ;; boundary if necessary as this should return:
        ;; (or (integer 1 1) (integer 5 5))
        )