3 files changed, 8 insertions, 7 deletions

diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 39156fbb5dc..a184fabb9ff 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -771,9 +771,9 @@ delivered."
           (copy-file file-notify--test-tmpfile file-notify--test-tmpfile1)
           ;; The next two events shall not be visible.
           (file-notify--test-read-event)
-          (set-file-modes file-notify--test-tmpfile 000)
+          (set-file-modes file-notify--test-tmpfile 000 'nofollow)
           (file-notify--test-read-event)
-          (set-file-times file-notify--test-tmpfile '(0 0))
+          (set-file-times file-notify--test-tmpfile '(0 0) 'nofollow)
           (file-notify--test-read-event)
           (delete-directory file-notify--test-tmpdir 'recursive))
         (file-notify-rm-watch file-notify--test-desc)
@@ -864,9 +864,9 @@ delivered."
           (write-region
            "any text" nil file-notify--test-tmpfile nil 'no-message)
           (file-notify--test-read-event)
-          (set-file-modes file-notify--test-tmpfile 000)
+          (set-file-modes file-notify--test-tmpfile 000 'nofollow)
           (file-notify--test-read-event)
-          (set-file-times file-notify--test-tmpfile '(0 0))
+          (set-file-times file-notify--test-tmpfile '(0 0) 'nofollow)
           (file-notify--test-read-event)
           (delete-file file-notify--test-tmpfile))
         (file-notify-rm-watch file-notify--test-desc)
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index ac56a7732f2..05d9ceebf1d 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1003,9 +1003,9 @@ unquoted file names."
 
 (ert-deftest files-tests-file-name-non-special-set-file-times ()
   (files-tests--with-temp-non-special (tmpfile nospecial)
-    (set-file-times nospecial))
+    (set-file-times nospecial nil 'nofollow))
   (files-tests--with-temp-non-special-and-file-name-handler (tmpfile nospecial)
-    (should-error (set-file-times nospecial))))
+    (should-error (set-file-times nospecial nil 'nofollow))))
 
 (ert-deftest files-tests-file-name-non-special-set-visited-file-modtime ()
   (files-tests--with-temp-non-special (tmpfile nospecial)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index be0f418c943..dcf376e70b4 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3743,7 +3743,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
                             (file-attributes tmp-name1))))
             ;; Skip the test, if the remote handler is not able to set
             ;; the correct time.
-            (skip-unless (set-file-times tmp-name1 (seconds-to-time 1)))
+            (skip-unless (set-file-times tmp-name1 (seconds-to-time 1)
+                                         'nofollow))
             ;; Dumb remote shells without perl(1) or stat(1) are not
             ;; able to return the date correctly.  They say "don't know".
             (unless (tramp-compat-time-equal-p