diff --git a/core/autoload/test.el b/core/autoload/test.el
index 3cdb91bea..34427ca1a 100644
--- a/core/autoload/test.el
+++ b/core/autoload/test.el
@@ -10,7 +10,10 @@ If neither is available, run all tests in all enabled modules."
   (interactive)
   (let ((doom-modules (make-hash-table :test #'equal)))
     ;; ensure DOOM is initialized
-    (doom-initialize-packages t)
+    (let (noninteractive)
+      ;; Core libraries aren't fully loaded in a noninteractive session, so
+      ;; we reload it with `noninteractive' set to nil to force them to.
+      (load (expand-file-name "core.el" doom-core-dir) nil t t))
     (condition-case-unless-debug ex
         (let ((target-paths
                ;; Convert targets (either from MODULES or `argv') into a list of
@@ -18,7 +21,7 @@ If neither is available, run all tests in all enabled modules."
                (cond ((string= (car argv) "--") ; command line
                       (save-match-data
                         (cl-loop for arg in (cdr argv)
-                                 if (equal arg "core") collect doom-core-dir
+                                 if (string= arg "core") collect doom-core-dir
                                  else if (string-match-p "/" arg)
                                  nconc (cl-loop for dir in doom-modules-dirs
                                                 collect (expand-file-name arg dir))
diff --git a/modules/completion/company/test/company.el b/modules/completion/company/test/company.el
index 4f7244c14..5e4eadf3d 100644
--- a/modules/completion/company/test/company.el
+++ b/modules/completion/company/test/company.el
@@ -1,9 +1,6 @@
 ;; -*- lexical-binding: t; no-byte-compile: t; -*-
 ;;; completion/company/test/company.el
 
-(require! :completion company)
-(require 'company)
-
 ;;
 (def-test! set-company-backend
   :minor-mode company-mode
diff --git a/modules/feature/evil/test/evil.el b/modules/feature/evil/test/evil.el
index 9cad36c70..525f4f153 100644
--- a/modules/feature/evil/test/evil.el
+++ b/modules/feature/evil/test/evil.el
@@ -1,8 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; feature/evil/test/evil.el
 
-(require! :feature evil)
-
 ;;
 ;; `evil-ex-replace-special-filenames'
 (def-test! resolve-vim-path