2 files changed, 1 insertions, 60 deletions
diff --git a/src/nvim/testdir/test_bufline.vim b/src/nvim/testdir/test_bufline.vim
index 2567dd2be2..076f03fdd8 100644
--- a/src/nvim/testdir/test_bufline.vim
+++ b/src/nvim/testdir/test_bufline.vim
@@ -19,7 +19,7 @@ func Test_setbufline_getbufline()
   let b = bufnr('%')
   wincmd w
   call assert_equal(1, setbufline(b, 5, ['x']))
-  call assert_equal(1, setbufline(bufnr('$') + 1, 1, ['x']))
+  call assert_equal(1, setbufline(1234, 1, ['x']))
   call assert_equal(0, setbufline(b, 4, ['d', 'e']))
   call assert_equal(['c'], getbufline(b, 3))
   call assert_equal(['d'], getbufline(b, 4))
diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim
index d0a8f342c9..30239a90c2 100644
--- a/src/nvim/testdir/test_messages.vim
+++ b/src/nvim/testdir/test_messages.vim
@@ -89,65 +89,6 @@ func Test_echoerr()
   call test_ignore_error('RESET')
 endfunc
 
-func Test_mode_message_at_leaving_insert_by_ctrl_c()
-  if !has('terminal') || has('gui_running')
-    return
-  endif
-
-  " Set custom statusline built by user-defined function.
-  let testfile = 'Xtest.vim'
-  call writefile([
-        \ 'func StatusLine() abort',
-        \ '  return ""',
-        \ 'endfunc',
-        \ 'set statusline=%!StatusLine()',
-        \ 'set laststatus=2',
-        \ ], testfile)
-
-  let rows = 10
-  let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
-  call term_wait(buf, 200)
-  call assert_equal('run', job_status(term_getjob(buf)))
-
-  call term_sendkeys(buf, "i")
-  call WaitForAssert({-> assert_match('^-- INSERT --\s*$', term_getline(buf, rows))})
-  call term_sendkeys(buf, "\<C-C>")
-  call WaitForAssert({-> assert_match('^\s*$', term_getline(buf, rows))})
-
-  call term_sendkeys(buf, ":qall!\<CR>")
-  call WaitForAssert({-> assert_equal('dead', job_status(term_getjob(buf)))})
-  exe buf . 'bwipe!'
-  call delete(testfile)
-endfunc
-
-func Test_mode_message_at_leaving_insert_with_esc_mapped()
-  if !has('terminal') || has('gui_running')
-    return
-  endif
-
-  " Set custom statusline built by user-defined function.
-  let testfile = 'Xtest.vim'
-  call writefile([
-        \ 'set laststatus=2',
-        \ 'inoremap <Esc> <Esc>00',
-        \ ], testfile)
-
-  let rows = 10
-  let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
-  call term_wait(buf, 200)
-  call assert_equal('run', job_status(term_getjob(buf)))
-
-  call term_sendkeys(buf, "i")
-  call WaitForAssert({-> assert_match('^-- INSERT --\s*$', term_getline(buf, rows))})
-  call term_sendkeys(buf, "\<Esc>")
-  call WaitForAssert({-> assert_match('^\s*$', term_getline(buf, rows))})
-
-  call term_sendkeys(buf, ":qall!\<CR>")
-  call WaitForAssert({-> assert_equal('dead', job_status(term_getjob(buf)))})
-  exe buf . 'bwipe!'
-  call delete(testfile)
-endfunc
-
 func Test_echospace()
   set noruler noshowcmd laststatus=1
   call assert_equal(&columns - 1, v:echospace)