diff --git a/Makefile b/Makefile
index 1e43b21c..e35d1e9e 100644
--- a/Makefile
+++ b/Makefile
@@ -108,12 +108,9 @@ emacs-batch:
 	@echo ""
 	@echo "$(ORG_FILE) ::"
 	@$(EMACS) --batch --eval "(progn\
-        (setq debug-ignored-errors (remq 'user-error debug-ignored-errors))\
-        (toggle-debug-on-error)\
 	(setenv \"OX_HUGO_ELPA\" \"$(OX_HUGO_ELPA)\")\
 	(when (> (length \"$(TIMEZONE)\") 0) (setenv \"TZ\" \"$(TIMEZONE)\"))\
         (setenv \"LANGUAGE\" \"en_US.UTF-8\")\
-	(setq-default make-backup-files nil)\
 	(load-file (expand-file-name \"setup-ox-hugo.el\" \"$(OX_HUGO_TEST_DIR)\"))\
 	)" $(ORG_FILE) \
 	-f $(FUNC) \
diff --git a/test/setup-ox-hugo.el b/test/setup-ox-hugo.el
index 35b9266c..a78061a0 100644
--- a/test/setup-ox-hugo.el
+++ b/test/setup-ox-hugo.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2018-02-22 14:58:32 kmodi>
+;; Time-stamp: <2018-08-28 13:20:23 kmodi>
 
 ;; Setup to export Org files to Hugo-compatible Markdown using
 ;; `ox-hugo' in an "emacs -Q" environment.
@@ -6,6 +6,11 @@
 ;; Some sane settings
 (setq-default require-final-newline t)
 (setq-default indent-tabs-mode nil)
+(setq-default make-backup-files nil)
+
+;; Toggle debug on error, including `user-error'.
+(setq debug-ignored-errors (remq 'user-error debug-ignored-errors))
+(toggle-debug-on-error)
 
 (defvar ox-hugo-test-setup-verbose nil
   "When non-nil, enable printing more messages from setup-ox-hugo.el.")