2 files changed, 18 insertions, 13 deletions

diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el
index 8ef2ce70251..ab70b3009e4 100644
--- a/test/lisp/emacs-lisp/bytecomp-tests.el
+++ b/test/lisp/emacs-lisp/bytecomp-tests.el
@@ -512,7 +512,9 @@ bytecompiled code, and their results compared.")
   `(let ((,file-name-var (make-temp-file "emacs")))
      (unwind-protect
          (progn ,@body)
-       (delete-file ,file-name-var))))
+       (delete-file ,file-name-var)
+       (let ((elc (concat ,file-name-var ".elc")))
+         (if (file-exists-p elc) (delete-file elc))))))
 
 (ert-deftest bytecomp-tests--unescaped-char-literals ()
   "Check that byte compiling warns about unescaped character
diff --git a/test/lisp/progmodes/etags-tests.el b/test/lisp/progmodes/etags-tests.el
index 0153f327ba8..845f3fe76a8 100644
--- a/test/lisp/progmodes/etags-tests.el
+++ b/test/lisp/progmodes/etags-tests.el
@@ -96,15 +96,18 @@
 (ert-deftest etags-buffer-local-tags-table-list ()
   "Test that a buffer-local value of `tags-table-list' is used."
   (let ((file (make-temp-file "etag-test-tmpfile")))
-    (set-buffer (find-file-noselect file))
-    (fundamental-mode)
-    (setq-local tags-table-list
-                (list (expand-file-name "manual/etags/ETAGS.good_3"
-                                        etags-tests--test-dir)))
-    (cl-letf ((tag-tables tags-table-list)
-              (tags-file-name nil)
-              ((symbol-function 'read-file-name)
-               (lambda (&rest _)
-                 (error "We should not prompt the user"))))
-      (should (visit-tags-table-buffer))
-      (should (equal tags-file-name (car tag-tables))))))
+    (unwind-protect
+        (progn
+          (set-buffer (find-file-noselect file))
+          (fundamental-mode)
+          (setq-local tags-table-list
+                      (list (expand-file-name "manual/etags/ETAGS.good_3"
+                                              etags-tests--test-dir)))
+          (cl-letf ((tag-tables tags-table-list)
+                    (tags-file-name nil)
+                    ((symbol-function 'read-file-name)
+                     (lambda (&rest _)
+                       (error "We should not prompt the user"))))
+            (should (visit-tags-table-buffer))
+            (should (equal tags-file-name (car tag-tables)))))
+      (delete-file file))))