4 files changed, 11 insertions, 11 deletions
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index c290031fbe..4d6b125f9f 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -207,18 +207,18 @@ describe('terminal buffer', function()
       feed_command('terminal')
       feed('<c-\\><c-n>')
       feed_command('confirm bdelete')
-      screen:expect('Close "term://', nil, true, nil, true)
+      screen:expect{any='Close "term://', attr_ignore=true}
     end)
 
     it('with &confirm', function()
       feed_command('terminal')
       feed('<c-\\><c-n>')
       feed_command('bdelete')
-      screen:expect('E89', nil, true, nil, true)
+      screen:expect{any='E89', attr_ignore=true}
       feed('<cr>')
       eq('terminal', eval('&buftype'))
       feed_command('set confirm | bdelete')
-      screen:expect('Close "term://', nil, true, nil, true)
+      screen:expect{any='Close "term://', attr_ignore=true}
       feed('y')
       neq('terminal', eval('&buftype'))
     end)
@@ -242,7 +242,7 @@ describe('No heap-buffer-overflow when using', function()
     feed('$')
     -- Let termopen() modify the buffer
     feed_command('call termopen("echo")')
-    wait()
+    eq(2, eval('1+1')) -- check nvim still running
     feed_command('bdelete!')
   end)
 end)
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index f98add41a0..dbee9bdb49 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -54,7 +54,7 @@ describe(':terminal', function()
     else
       feed_command([[terminal printf '\e[6n'; sleep 0.5 ]])
     end
-    screen:expect('%^%[%[1;1R', nil, nil, nil, true)
+    screen:expect{any='%^%[%[1;1R'}
   end)
 
   it("in normal-mode :split does not move cursor", function()
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua
index c665e64a80..5e36fea474 100644
--- a/test/functional/terminal/scrollback_spec.lua
+++ b/test/functional/terminal/scrollback_spec.lua
@@ -408,7 +408,7 @@ describe("'scrollback' option", function()
     else
       feed_data('for i in $(seq 1 30); do echo "line$i"; done\n')
     end
-    screen:expect('line30                        ', nil, nil, nil, true)
+    screen:expect{any='line30                        '}
     retry(nil, nil, function() expect_lines(7) end)
 
     screen:detach()
@@ -426,7 +426,7 @@ describe("'scrollback' option", function()
     curbufmeths.set_option('scrollback', 200)
 
     -- Wait for prompt.
-    screen:expect('$', nil, nil, nil, true)
+    screen:expect{any='$'}
 
     wait()
     if iswin() then
@@ -435,7 +435,7 @@ describe("'scrollback' option", function()
       feed_data('for i in $(seq 1 30); do echo "line$i"; done\n')
     end
 
-    screen:expect('line30                        ', nil, nil, nil, true)
+    screen:expect{any='line30                        '}
 
     retry(nil, nil, function() expect_lines(33, 2) end)
     curbufmeths.set_option('scrollback', 10)
@@ -452,7 +452,7 @@ describe("'scrollback' option", function()
       feed_data('for i in $(seq 1 40); do echo "line$i"; done\n')
     end
 
-    screen:expect('line40                        ', nil, nil, nil, true)
+    screen:expect{any='line40                        '}
 
     retry(nil, nil, function() expect_lines(58) end)
     -- Verify off-screen state
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index c0404ff463..351038e521 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -400,7 +400,7 @@ describe('tui FocusGained/FocusLost', function()
       -- Exit cmdline-mode. Redraws from timers/events are blocked during
       -- cmdline-mode, so the buffer won't be updated until we exit cmdline-mode.
       feed_data('\n')
-      screen:expect('lost'..(' '):rep(46)..'\ngained', nil, nil, nil, true)
+      screen:expect{any='lost'..(' '):rep(46)..'\ngained'}
     end)
   end)
 
@@ -740,7 +740,7 @@ describe("tui 'term' option", function()
     screen.timeout = 250  -- We want screen:expect() to fail quickly.
     retry(nil, 2 * full_timeout, function()  -- Wait for TUI thread to set 'term'.
       feed_data(":echo 'term='.(&term)\n")
-      screen:expect('term='..term_expected, nil, nil, nil, true)
+      screen:expect{any='term='..term_expected}
     end)
   end