diff --git a/Cask b/Cask
index 6ff981350..ebe7cf967 100644
--- a/Cask
+++ b/Cask
@@ -303,3 +303,8 @@
 
 ;; Debugging -- modules/custom-debug.el
 (depends-on "realgud")
+
+
+;;;; DEV TOOLS ;;;;;;;;;;;;;;;;;
+(development
+  (depends-on "ert-runner"))
diff --git a/Makefile b/Makefile
index 23fc9a803..b68726b2b 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,9 @@ clean-cache:
 clean-lite:
 	@rm -f init.elc core/core.elc
 
+test:
+	@cask exec ert-runner -l core/core.el
+
 ########################################
 
 %.elc: %.el
@@ -44,4 +47,4 @@ _install: clean-lite
 	@cask install 2>&1
 	@mkdir -p $(CACHE_DIR)/{undo,backup,workgroups}
 
-.PHONY: all
+.PHONY: all test
diff --git a/test/basic-test.el b/test/basic-test.el
new file mode 100644
index 000000000..a37682b79
--- /dev/null
+++ b/test/basic-test.el
@@ -0,0 +1,5 @@
+;;; basic-test.el
+
+(ert-deftest doom-basic-test ()
+  (should t))
+
diff --git a/test/test-helper.el b/test/test-helper.el
new file mode 100644
index 000000000..dabc85ec0
--- /dev/null
+++ b/test/test-helper.el
@@ -0,0 +1,6 @@
+;;; test-helper.el
+
+(require 'ert)
+
+(provide 'test-helper)
+;;; test-helper.el ends here