diff --git a/core/test/test-autoload-package.el b/core/test/test-autoload-package.el
index 73ba65722..3560b53e7 100644
--- a/core/test/test-autoload-package.el
+++ b/core/test/test-autoload-package.el
@@ -4,6 +4,7 @@
 (describe "core/autoload/packages"
   :var (package-alist
         package-archive-contents
+        package-selected-packages
         doom-packages
         quelpa-cache
         quelpa-initialized-p
@@ -16,7 +17,9 @@
   (before-all
     (fset 'pkg
           (lambda (name version &optional reqs)
-            (package-desc-create :name name :version version :reqs reqs)))
+            (package-desc-create
+             :name name :version version :reqs reqs
+             :dir (expand-file-name (format "%s/" name) package-user-dir))))
     (require 'package)
     (require 'quelpa)
     (setq doom-packages-dir (expand-file-name "packages/" (file-name-directory load-file-name))
@@ -24,6 +27,7 @@
           quelpa-dir (expand-file-name "quelpa" doom-packages-dir)
           quelpa-initialized-p t
           doom-core-packages nil)
+    (spy-on #'package--user-installed-p :and-call-fake (lambda (_p) t))
     (spy-on #'doom-initialize-packages :and-call-fake (lambda (&optional _)))
     (spy-on #'package-refresh-contents :and-call-fake (lambda (&optional _)))
     (spy-on #'quelpa-checkout :and-call-fake
@@ -57,7 +61,8 @@
           quelpa-cache
           '((doom-quelpa-dummy :fetcher github :repo "hlissner/does-not-exist")
             (doom-noquelpa-dummy :fetcher github :repo "hlissner/does-not-exist-3")
-            (doom-new-quelpa-dummy :fetcher github :repo "hlissner/does-not-exist-2"))))
+            (doom-new-quelpa-dummy :fetcher github :repo "hlissner/does-not-exist-2"))
+          package-selected-packages (mapcar #'car doom-packages)))
 
   (describe "package-backend"
     (it "determines the correct backend of a package"
diff --git a/core/test/test-core-ui.el b/core/test/test-core-ui.el
index 2ef290d63..eedc64a1d 100644
--- a/core/test/test-core-ui.el
+++ b/core/test/test-core-ui.el
@@ -23,12 +23,12 @@
       (expect (js-mode) :to-throw 'error)))
 
 
-  (describe "doom|protect-visible-buffers"
+  (describe "doom|protect-visible-buffer"
     :var (kill-buffer-query-functions wconf a b)
     (before-each
       (setq a (switch-to-buffer (get-buffer-create "a"))
             b (get-buffer-create "b")
-            kill-buffer-query-functions '(doom|protect-visible-buffers)
+            kill-buffer-query-functions '(doom|protect-visible-buffer)
             wconf (current-window-configuration))
       (delete-other-windows))