4 files changed, 9 insertions, 2 deletions
diff --git a/test/functional/eval/timer_spec.lua b/test/functional/eval/timer_spec.lua
index ef7df69fdb..9ee0735e40 100644
--- a/test/functional/eval/timer_spec.lua
+++ b/test/functional/eval/timer_spec.lua
@@ -215,8 +215,8 @@ describe('timers', function()
       endfunc
     ]])
     command("call timer_start(5, 'MyHandler', {'repeat': 1})")
-    run(nil, nil, nil, load_adjust(10))
-    retry(nil, load_adjust(100), function()
+    run(nil, nil, nil, load_adjust(20))
+    retry(nil, load_adjust(150), function()
       eq(1, eval("g:val"))
     end)
   end)
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index 8e171d31aa..209537831f 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -6,6 +6,7 @@ local eval, feed_command, source = helpers.eval, helpers.feed_command, helpers.s
 local eq, neq = helpers.eq, helpers.neq
 local write_file = helpers.write_file
 local command= helpers.command
+local exc_exec = helpers.exc_exec
 
 describe(':terminal buffer', function()
   local screen
@@ -253,6 +254,10 @@ describe(':terminal buffer', function()
     ]])
     command('bdelete!')
   end)
+
+  it('handles wqall', function()
+    eq('Vim(wqall):E948: Job still running', exc_exec('wqall'))
+  end)
 end)
 
 describe('No heap-buffer-overflow when using', function()
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua
index 77fdba7fc4..b932c58430 100644
--- a/test/functional/terminal/scrollback_spec.lua
+++ b/test/functional/terminal/scrollback_spec.lua
@@ -410,6 +410,7 @@ describe("'scrollback' option", function()
       command([[let $PROMPT='$$']])
       screen = thelpers.screen_setup(nil, "['cmd.exe']", 30)
     else
+      command('let $PS1 = "$"')
       screen = thelpers.screen_setup(nil, "['sh']", 30)
     end
 
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua
index 85c3f8c2de..65c6fabfa8 100644
--- a/test/functional/ui/wildmode_spec.lua
+++ b/test/functional/ui/wildmode_spec.lua
@@ -161,6 +161,7 @@ describe("'wildmenu'", function()
 
     if not iswin() then
       command('set shell=sh')  -- Need a predictable "$" prompt.
+      command('let $PS1 = "$"')
     end
     command('set laststatus=0')
     command('vsplit')