diff --git a/mk/default.mk b/mk/default.mk
index dda261084..886efc630 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -75,7 +75,7 @@ BTEST	= $(BATCH) \
 # Using emacs in batch mode.
 # BATCH = $(EMACS) -batch -vanilla # XEmacs
 BATCH	= $(EMACS) -batch -Q \
-	  --eval '(setq vc-handled-backends nil)'
+	  --eval '(setq vc-handled-backends nil org-startup-folded nil)'
 
 # Emacs must be started in toplevel directory
 BATCHO	= $(BATCH) \
diff --git a/testing/org-test.el b/testing/org-test.el
index 565a384d0..7ffb1169d 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -420,7 +420,7 @@ Load all test files first."
   (let ((org-id-track-globally t)
 	(org-test-selector
 	 (if org-test-selector org-test-selector "\\(org\\|ob\\)"))
-	org-confirm-babel-evaluate vc-handled-backends)
+	org-confirm-babel-evaluate org-startup-folded vc-handled-backends)
     (org-test-touch-all-examples)
     (org-test-update-id-locations)
     (org-test-load)