diff --git a/lisp/lint/package.el b/lisp/lint/package.el
index ee45bbf4..676ddcdc 100644
--- a/lisp/lint/package.el
+++ b/lisp/lint/package.el
@@ -54,7 +54,7 @@
     (eask-msg "`%s` with package-lint (%s)" (ansi-green file) eask-lint-package--version)
     (with-current-buffer (find-file filename)
       (package-lint-current-buffer)
-      (kill-this-buffer)))
+      (kill-current-buffer)))
   (eask-print-log-buffer "*Package-Lint*"))
 
 (eask-start
diff --git a/lisp/lint/regexps.el b/lisp/lint/regexps.el
index bc3a892b..9540863c 100644
--- a/lisp/lint/regexps.el
+++ b/lisp/lint/regexps.el
@@ -58,7 +58,7 @@
                    (capitalize (eask-2str severity)) msg)))
       (unless errors
         (eask-msg "No issues found"))
-      (kill-this-buffer))))
+      (kill-current-buffer))))
 
 (eask-start
   ;; Preparation
diff --git a/test/development/compat.el b/test/development/compat.el
index 91f2f112..18294043 100644
--- a/test/development/compat.el
+++ b/test/development/compat.el
@@ -27,7 +27,8 @@
      package-generate-description-file
      locate-dominating-file
      url-file-exists-p
-     prin1-to-string)
+     prin1-to-string
+     kill-current-buffer)
   "List of function to check Emacs compatibility.")
 
 (message "Starting compatibility test for functions...")
diff --git a/test/jest/outdated-upgrade/make-outdate.el b/test/jest/outdated-upgrade/make-outdate.el
index 63d6c5d7..d2865928 100644
--- a/test/jest/outdated-upgrade/make-outdate.el
+++ b/test/jest/outdated-upgrade/make-outdate.el
@@ -44,7 +44,7 @@
             (delete-region (point) end)
             (insert (format "\"%s\"" make-outdate-version)))))
       (save-buffer)
-      (kill-this-buffer))
+      (kill-current-buffer))
     (let ((dest (expand-file-name (concat name "-" make-outdate-version "/") package-user-dir)))
       (eask-info "Moving %s" dir)
       (eask-info "    to %s" dest)