diff --git a/core/test/autoload-buffers.el b/core/test/autoload-buffers.el
index b4ba44aa6..abf5c4245 100644
--- a/core/test/autoload-buffers.el
+++ b/core/test/autoload-buffers.el
@@ -8,7 +8,9 @@
       (push `(,bsym (get-buffer-create ,(symbol-name bsym)))
             buffers))
     `(save-window-excursion
-       (cl-flet ((buffer-list (lambda () (list ,@(reverse (mapcar #'car buffers))))))
+       (cl-flet ((buffer-list
+                  (lambda ()
+                    (cl-remove-if-not #'buffer-live-p (list ,@(reverse (mapcar #'car buffers)))))))
          (let* (persp-mode
                 ,@buffers)
            ,@body