5 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index 34bf4b5ace..bc0c7f73d1 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -118,7 +118,7 @@ describe('server -> client', function()
 
   describe('when the client is a recursive vim instance', function()
     before_each(function()
-      nvim('command', "let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '--embed'])")
+      nvim('command', "let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--embed'])")
       neq(0, eval('vim'))
     end)
 
diff --git a/test/functional/ex_cmds/recover_spec.lua b/test/functional/ex_cmds/recover_spec.lua
index a24a60af81..a2e0978e63 100644
--- a/test/functional/ex_cmds/recover_spec.lua
+++ b/test/functional/ex_cmds/recover_spec.lua
@@ -47,7 +47,7 @@ describe(':preserve', function()
 
     --TODO(justinmk): this is an ugly hack to force `helpers` to support
     --multiple sessions.
-    local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE', '--embed'},
+    local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'},
                                 true)
     helpers.set_session(nvim2)
 
diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua
index 0c85157a0f..b6b9185cf2 100644
--- a/test/functional/ex_cmds/wviminfo_spec.lua
+++ b/test/functional/ex_cmds/wviminfo_spec.lua
@@ -13,7 +13,7 @@ describe(':wshada', function()
     end
 
     -- Override the default session because we need 'swapfile' for these tests.
-    local session = spawn({nvim_prog, '-u', 'NONE', '--embed',
+    local session = spawn({nvim_prog, '-u', 'NONE', '-i', '/dev/null', '--embed',
                            '--cmd', 'set swapfile'})
     set_session(session)
 
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index d604703fee..5ec087645f 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -11,7 +11,7 @@ describe('tui', function()
 
   before_each(function()
     helpers.clear()
-    screen = thelpers.screen_setup(0, '["'..helpers.nvim_prog..'", "-u", "NONE", "--cmd", "set noswapfile"]')
+    screen = thelpers.screen_setup(0, '["'..helpers.nvim_prog..'", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile"]')
     screen.timeout = 30000 -- pasting can be really slow in the TUI
     screen:expect([[
       {1: }                                                 |
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 1be83d745e..c767f9b83a 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -125,7 +125,7 @@ end
 
 do
   local spawn, nvim_prog = helpers.spawn, helpers.nvim_prog
-  local session = spawn({nvim_prog, '-u', 'NONE', '-N', '--embed'})
+  local session = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N', '--embed'})
   local status, rv = session:request('vim_get_color_map')
   if not status then
     print('failed to get color map')