1 files changed, 11 insertions, 6 deletions
diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua
index 89651284b5..7d2fdfc26e 100644
--- a/test/functional/legacy/autochdir_spec.lua
+++ b/test/functional/legacy/autochdir_spec.lua
@@ -64,7 +64,7 @@ describe('autochdir behavior', function()
   it('win_execute() does not change directory', function()
     local subdir = 'Xfile'
     command('cd '..dir)
-    command('set autochdir')
+    command('set acd')
     call('mkdir', subdir)
     local winid = eval('win_getid()')
     command('new '..subdir..'/file')
@@ -85,23 +85,28 @@ describe('autochdir behavior', function()
     command('split '..subdir..'/local.txt')
     command('lcd '..subdir)
     matches('%[window%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
-    command('set autochdir')
+    command('set acd')
     command('wincmd w')
     matches('%[autochdir%].*'..dir, exec_capture('verbose pwd'))
-    command('lcd '..cwd)
-    matches('%[window%].*'..dir, exec_capture('verbose pwd'))
     command('tcd '..cwd)
     matches('%[tabpage%].*'..dir, exec_capture('verbose pwd'))
     command('cd '..cwd)
     matches('%[global%].*'..dir, exec_capture('verbose pwd'))
+    command('lcd '..cwd)
+    matches('%[window%].*'..dir, exec_capture('verbose pwd'))
     command('edit')
     matches('%[autochdir%].*'..dir, exec_capture('verbose pwd'))
+    command('enew')
     command('wincmd w')
     matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
-    command('set noautochdir')
-    matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    command('wincmd w')
+    matches('%[window%].*'..dir, exec_capture('verbose pwd'))
     command('wincmd w')
     matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    command('set noacd')
+    matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    command('wincmd w')
+    matches('%[window%].*'..dir, exec_capture('verbose pwd'))
     command('cd '..cwd)
     matches('%[global%].*'..dir, exec_capture('verbose pwd'))
     command('wincmd w')