diff --git a/Makefile b/Makefile
index c34928482..ee1e54456 100644
--- a/Makefile
+++ b/Makefile
@@ -43,10 +43,10 @@ clean-pcache:
 	@$(EMACS) -l persistent-soft --eval '(delete-directory pcache-directory t)'
 
 test: init.el .local/autoloads.el
-	@$(TEST_EMACS) $(patsubst %,-l %, $(TESTS)) -f ert-run-tests-batch-and-exit
+	@$(TEST_EMACS) $(patsubst %,-l %, $(TESTS)) -l test/run.el
 
 $(TESTS): init.el .local/autoloads.el
-	@$(TEST_EMACS) $(patsubst %,-l %, $@) -f ert-run-tests-batch-and-exit
+	@$(TEST_EMACS) $(patsubst %,-l %, $@) -l test/run.el
 
 doctor:
 	@./bin/doctor
diff --git a/test/init.test.el b/test/init.test.el
index 80cbfa866..1b65f6575 100644
--- a/test/init.test.el
+++ b/test/init.test.el
@@ -2,7 +2,5 @@
 
 (require 'core (concat user-emacs-directory "core/core"))
 
-(setq-default debug-on-error nil)
-
 (doom! :feature evil
        :private hlissner)
diff --git a/test/run.el b/test/run.el
new file mode 100644
index 000000000..421cf1bc2
--- /dev/null
+++ b/test/run.el
@@ -0,0 +1,6 @@
+;;; ../test/setup.el
+
+(setq-default debug-on-error nil)
+
+(run-hooks 'after-init-hook 'emacs-startup-hook 'window-setup-hook)
+(ert-run-tests-batch-and-exit)