diff --git a/Makefile b/Makefile
index 0028dcc04..3edcc5d80 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,10 @@ clean-elc:
 	@rm -fv init.elc
 	@find {core,modules} -type f -iname '*.elc' -exec rm \-fv {} \;
 
+test:
+	@$(EMACS) --batch -l test/init.el -f 'doom!run-tests'
+
 init.el:
 	@[ -f init.el ] || $(error No init.el file, please create one or copy init.example.el)
 
-.PHONY: all
+.PHONY: all test
diff --git a/test/core/package-management.el b/test/core/package-management.el
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/basic-test.el b/test/test-basic.el
similarity index 100%
rename from test/basic-test.el
rename to test/test-basic.el
diff --git a/test/test-helper.el b/test/test-helper.el
deleted file mode 100644
index dabc85ec0..000000000
--- a/test/test-helper.el
+++ /dev/null
@@ -1,6 +0,0 @@
-;;; test-helper.el
-
-(require 'ert)
-
-(provide 'test-helper)
-;;; test-helper.el ends here