diff --git a/core/test/test-autoload-buffers.el b/core/test/test-autoload-buffers.el
index 931c4ddfa..f80e2538c 100644
--- a/core/test/test-autoload-buffers.el
+++ b/core/test/test-autoload-buffers.el
@@ -1,6 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; core/test/test-autoload-buffers.el
 
+(require 'core-projects)
 (load! "autoload/buffers" doom-core-dir)
 
 ;;
diff --git a/core/test/test-autoload-files.el b/core/test/test-autoload-files.el
index 996cd7e17..f3c2d4b92 100644
--- a/core/test/test-autoload-files.el
+++ b/core/test/test-autoload-files.el
@@ -1,11 +1,11 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; core/test/test-autoload-files.el
+;;;
+(require 'core-projects)
+(require 'projectile)
 
 (describe "core/autoload/files"
   :var (src dest projectile-projects-cache-time projectile-projects-cache)
-  (before-all (require 'projectile))
-  (after-all  (unload-feature 'projectile t))
-
   (before-each
     (setq src      (make-temp-file "test-src")
           existing (make-temp-file "test-existing")
diff --git a/core/test/test-core-projects.el b/core/test/test-core-projects.el
index e2c715283..0afc0c1f1 100644
--- a/core/test/test-core-projects.el
+++ b/core/test/test-core-projects.el
@@ -2,13 +2,11 @@
 ;;; ../core/test/test-core-projects.el
 
 (require 'core-projects)
+(require 'projectile)
 
 (describe "core/projects"
-  (before-all (require 'projectile))
-  (after-all  (unload-feature 'projectile t))
-
   (before-each (projectile-mode +1))
-  (after-each (projectile-mode -1))
+  (after-each  (projectile-mode -1))
 
   (describe "project-p"
     (it "Should detect when in a valid project"
diff --git a/modules/ui/doom-dashboard/test/test-doom-dashboard.el b/modules/ui/doom-dashboard/test/test-doom-dashboard.el
index 4c482158b..507c6c93a 100644
--- a/modules/ui/doom-dashboard/test/test-doom-dashboard.el
+++ b/modules/ui/doom-dashboard/test/test-doom-dashboard.el
@@ -1,14 +1,13 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/doom-dashboard/test/test-doom-dashboard.el
 
+(require 'core-projects)
+(require 'projectile)
+(require! :ui doom-dashboard)
+
 (describe "ui/doom-dashboard"
   :var (default-directory projectile-enable-caching)
-  (before-all
-    (require! :ui doom-dashboard)
-    (require 'projectile)
-    (setq projectile-enable-caching nil))
-  (after-all
-    (unload-feature 'projectile t))
+  (before-all (setq projectile-enable-caching nil))
 
   (before-each (projectile-mode +1))
   (after-each  (projectile-mode -1))
diff --git a/modules/ui/popup/test/test-popup.el b/modules/ui/popup/test/test-popup.el
index 0f666affe..7a0b2327c 100644
--- a/modules/ui/popup/test/test-popup.el
+++ b/modules/ui/popup/test/test-popup.el
@@ -1,6 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/popup/test/test-popup.el
 
+(require! :ui popup)
+
 (describe "ui/popup"
   :var (display-buffer-alist
         +popup-default-display-buffer-actions
@@ -9,7 +11,6 @@
         wconf)
 
   (before-all
-    (require! :ui popup)
     (delete-other-windows)
     (switch-to-buffer "*scratch*")
     (setq wconf (current-window-configuration))