1 files changed, 11 insertions, 4 deletions

diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index d3610f00080..39088949b36 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -433,7 +433,8 @@ longer than timeout seconds for the events to be delivered."
             (write-region
              "any text" nil file-notify--test-tmpfile nil 'no-message)
             (read-event nil nil file-notify--test-read-event-timeout)
-            (delete-directory temporary-file-directory 'recursive))
+            (delete-directory temporary-file-directory 'recursive)
+            (read-event nil nil file-notify--test-read-event-timeout))
           (file-notify-rm-watch file-notify--test-desc))
 
         ;; Check copy of files inside a directory.
@@ -475,7 +476,8 @@ longer than timeout seconds for the events to be delivered."
             (read-event nil nil file-notify--test-read-event-timeout)
             (set-file-times file-notify--test-tmpfile '(0 0))
             (read-event nil nil file-notify--test-read-event-timeout)
-            (delete-directory temporary-file-directory 'recursive))
+            (delete-directory temporary-file-directory 'recursive)
+            (read-event nil nil file-notify--test-read-event-timeout))
           (file-notify-rm-watch file-notify--test-desc))
 
         ;; Check rename of files inside a directory.
@@ -509,7 +511,8 @@ longer than timeout seconds for the events to be delivered."
             (rename-file file-notify--test-tmpfile file-notify--test-tmpfile1)
             ;; After the rename, we won't get events anymore.
             (read-event nil nil file-notify--test-read-event-timeout)
-            (delete-directory temporary-file-directory 'recursive))
+            (delete-directory temporary-file-directory 'recursive)
+            (read-event nil nil file-notify--test-read-event-timeout))
           (file-notify-rm-watch file-notify--test-desc))
 
         ;; Check attribute change.  Does not work for cygwin.
@@ -527,7 +530,7 @@ longer than timeout seconds for the events to be delivered."
                ;; w32notify does not distinguish between `changed' and
                ;; `attribute-changed'.
                ((string-equal (file-notify--test-library) "w32notify")
-                '(changed changed changed changed))
+                '(changed changed))
                ;; For kqueue and in the remote case, `write-region'
                ;; raises also an `attribute-changed' event.
                ((or (string-equal (file-notify--test-library) "kqueue")
@@ -754,7 +757,9 @@ longer than timeout seconds for the events to be delivered."
         (should (file-notify-valid-p file-notify--test-desc))
         ;; After removing the watch, the descriptor must not be valid
         ;; anymore.
+        (read-event nil nil file-notify--test-read-event-timeout)
         (file-notify-rm-watch file-notify--test-desc)
+        (read-event nil nil file-notify--test-read-event-timeout)
         (file-notify--wait-for-events
          (file-notify--test-timeout)
          (not (file-notify-valid-p file-notify--test-desc)))
@@ -776,7 +781,9 @@ longer than timeout seconds for the events to be delivered."
         (should (file-notify-valid-p file-notify--test-desc))
         ;; After deleting the directory, the descriptor must not be
         ;; valid anymore.
+        (read-event nil nil file-notify--test-read-event-timeout)
         (delete-directory file-notify--test-tmpfile t)
+        (read-event nil nil file-notify--test-read-event-timeout)
         (file-notify--wait-for-events
          (file-notify--test-timeout)
          (not (file-notify-valid-p file-notify--test-desc)))