diff --git a/GNUmakefile b/GNUmakefile
index c584d2e..909ce87 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,16 +16,21 @@ package-oni-conf:
 	    --funcall package-initialize \
 	    --eval '(package-upload-file (car (file-expand-wildcards "oni-conf/dist/*.tar")))'
 
-test-%:
+install-%:
 	emacs --batch \
 	    --load oni-package.el \
 	    --funcall package-initialize \
 	    --eval '(package-refresh-contents)' \
-	    --load ert \
-	    --load "test/$*-test.el" \
-	    --funcall package-initialize \
 	    $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \
 	    --eval "(package-install-file \"$*.el\")" \
+
+test-%: install-%
+	emacs --batch \
+	    --load oni-package.el \
+	    --funcall package-initialize \
+	    --load ert \
+	    --load "test/$*-test.el" \
+	    --eval "(setq ert-batch-backtrace-right-margin nil)" \
 	    --funcall ert-run-tests-batch-and-exit
 
 clean: