diff --git a/syncthing-common-tests.el b/syncthing-common-tests.el
index 71e8dd5..866b7cf 100644
--- a/syncthing-common-tests.el
+++ b/syncthing-common-tests.el
@@ -15,9 +15,17 @@
 
 (defun syncthing-ert-cleanup ()
   (should (eq nil syncthing--servers))
-  (dolist (buf (buffer-list))
-    (unless (or (string-match-p (regexp-quote "*Messages*") (buffer-name buf)))
-      (kill-buffer buf))))
+  (mapc
+   (lambda (buff)
+     (unless
+         (or (string-match-p (regexp-quote "*Messages*") (buffer-name buff))
+             (string-match-p (regexp-quote " *code-conversion-work*")
+                             (buffer-name buff))
+             (string-match-p (regexp-quote " *code-converting-work*")
+                             (buffer-name buff))
+             (string-match-p "syncthing.*\\.el" (buffer-name buff)))
+       (kill-buffer buff)))
+   (buffer-list)))
 
 (ert-deftest syncthing-alist-var-access ()
   "Convert 'a' (string) to 'a (symbol) and access value with alist-get."
diff --git a/syncthing-keyboard-tests.el b/syncthing-keyboard-tests.el
index a299827..3bab69d 100644
--- a/syncthing-keyboard-tests.el
+++ b/syncthing-keyboard-tests.el
@@ -15,9 +15,17 @@
 
 (defun syncthing-ert-cleanup ()
   (should (eq nil syncthing--servers))
-  (dolist (buf (buffer-list))
-    (unless (or (string-match-p (regexp-quote "*Messages*") (buffer-name buf)))
-      (kill-buffer buf))))
+  (mapc
+   (lambda (buff)
+     (unless
+         (or (string-match-p (regexp-quote "*Messages*") (buffer-name buff))
+             (string-match-p (regexp-quote " *code-conversion-work*")
+                             (buffer-name buff))
+             (string-match-p (regexp-quote " *code-converting-work*")
+                             (buffer-name buff))
+             (string-match-p "syncthing.*\\.el" (buffer-name buff)))
+       (kill-buffer buff)))
+   (buffer-list)))
 
 (ert-deftest syncthing-keyboard-newline-apply ()
   "Call widget's `:action' when `point' is on top of it."
diff --git a/syncthing-network-tests.el b/syncthing-network-tests.el
index eeb39f2..24e4c1f 100644
--- a/syncthing-network-tests.el
+++ b/syncthing-network-tests.el
@@ -15,9 +15,17 @@
 
 (defun syncthing-ert-cleanup ()
   (should (eq nil syncthing--servers))
-  (dolist (buf (buffer-list))
-    (unless (or (string-match-p (regexp-quote "*Messages*") (buffer-name buf)))
-      (kill-buffer buf))))
+  (mapc
+   (lambda (buff)
+     (unless
+         (or (string-match-p (regexp-quote "*Messages*") (buffer-name buff))
+             (string-match-p (regexp-quote " *code-conversion-work*")
+                             (buffer-name buff))
+             (string-match-p (regexp-quote " *code-converting-work*")
+                             (buffer-name buff))
+             (string-match-p "syncthing.*\\.el" (buffer-name buff)))
+       (kill-buffer buff)))
+   (buffer-list)))
 
 (ert-deftest syncthing-ping-failure ()
   "Throw an auth error on bad token."
diff --git a/syncthing-tests.el b/syncthing-tests.el
index 094233f..b02822d 100644
--- a/syncthing-tests.el
+++ b/syncthing-tests.el
@@ -16,9 +16,17 @@
 
 (defun syncthing-ert-cleanup ()
   (should (eq nil syncthing--servers))
-  (dolist (buf (buffer-list))
-    (unless (or (string-match-p (regexp-quote "*Messages*") (buffer-name buf)))
-      (kill-buffer buf))))
+  (mapc
+   (lambda (buff)
+     (unless
+         (or (string-match-p (regexp-quote "*Messages*") (buffer-name buff))
+             (string-match-p (regexp-quote " *code-conversion-work*")
+                             (buffer-name buff))
+             (string-match-p (regexp-quote " *code-converting-work*")
+                             (buffer-name buff))
+             (string-match-p "syncthing.*\\.el" (buffer-name buff)))
+       (kill-buffer buff)))
+   (buffer-list)))
 
 (ert-deftest syncthing-run-customize ()
   "Run `customize-variable' on missing API token."