diff --git a/src/buffer.c b/src/buffer.c
index 7c69b8e..b434d58 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1635,7 +1635,7 @@
     void
 do_autochdir(void)
 {
-    if (starting == 0
+    if ((starting == 0 || test_autochdir)
 	    && curbuf->b_ffname != NULL
 	    && vim_chdirfile(curbuf->b_ffname) == OK)
 	shorten_fnames(TRUE);