1 files changed, 6 insertions, 13 deletions
diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index 209208ade2..3d019d3047 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -15,9 +15,6 @@ local neq = helpers.neq
 local mkdir = helpers.mkdir
 local rmdir = helpers.rmdir
 local alter_slashes = helpers.alter_slashes
-local spawn = helpers.spawn
-local nvim_prog = helpers.nvim_prog
-local set_session = helpers.set_session
 
 describe('startup defaults', function()
   describe(':filetype', function()
@@ -164,26 +161,22 @@ describe('startup defaults', function()
   end)
 
   it("'shadafile' ('viminfofile')", function()
-    -- Cannot use clear() because we do not want "-i NONE".
-    local function clear_use_default_shada()
-      set_session(spawn({nvim_prog, '-u', 'NONE', '--embed', '--headless'},
-                         false,
-                         {XDG_DATA_HOME='Xtest-userdata',
-                          XDG_CONFIG_HOME='Xtest-userconfig'}))
-    end
-    clear_use_default_shada()
+    local env = {XDG_DATA_HOME='Xtest-userdata', XDG_CONFIG_HOME='Xtest-userconfig'}
+    clear{args={}, args_rm={'-i'}, env=env}
     -- Default 'shadafile' is empty.
     -- This means use the default location. :help shada-file-name
     eq('', meths.get_option('shadafile'))
     eq('', meths.get_option('viminfofile'))
     -- Check that shada data (such as v:oldfiles) is saved/restored.
-    command('edit foo')
+    command('edit Xtest-foo')
     command('write')
     local f = eval('fnamemodify(@%,":p")')
     assert(string.len(f) > 3)
     command('qall')
-    clear_use_default_shada()
+    clear{args={}, args_rm={'-i'}, env=env}
     eq({ f }, eval('v:oldfiles'))
+    os.remove('Xtest-foo')
+    rmdir('Xtest-userdata')
   end)
 
   it("'packpath'", function()