2 files changed, 4 insertions, 2 deletions

diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 562ac266e44..442dc891571 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -307,7 +307,10 @@ FILE is the name of the file whose event is being reported."
   (unless (functionp callback)
     (signal 'wrong-type-argument `(,callback)))
 
-  (let* ((handler (find-file-name-handler file 'file-notify-add-watch))
+  (let* ((quoted (file-name-quoted-p file))
+         (file (file-name-unquote file))
+         (file-name-handler-alist (if quoted nil file-name-handler-alist))
+         (handler (find-file-name-handler file 'file-notify-add-watch))
          (dir (directory-file-name
                (if (file-directory-p file)
                    file
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index a72f5754aa6..6b394cd5b7b 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -533,7 +533,6 @@ be invoked with the right arguments."
     (should-not (file-newer-than-file-p nospecial nospecial))))
 
 (ert-deftest files-file-name-non-special-notify-handlers ()
-  :expected-result :failed
   (files-tests--with-temp-non-special (tmpfile nospecial)
     (let ((watch (file-notify-add-watch nospecial '(change) #'ignore)))
       (should (file-notify-valid-p watch))