3 files changed, 15 insertions, 16 deletions
diff --git a/src/nvim/testdir/test_edit.vim b/src/nvim/testdir/test_edit.vim
index dbe12fc8fc..7f456ffbce 100644
--- a/src/nvim/testdir/test_edit.vim
+++ b/src/nvim/testdir/test_edit.vim
@@ -735,17 +735,16 @@ func! Test_edit_CTRL_O()
 endfunc
 
 func! Test_edit_CTRL_R()
-  throw 'skipped: Nvim does not support test_override()'
   " Insert Register
   new
-  call test_override("ALL", 1)
+  " call test_override("ALL", 1)
   set showcmd
   call feedkeys("AFOOBAR eins zwei\<esc>", 'tnix')
   call feedkeys("O\<c-r>.", 'tnix')
   call feedkeys("O\<c-r>=10*500\<cr>\<esc>", 'tnix')
   call feedkeys("O\<c-r>=getreg('=', 1)\<cr>\<esc>", 'tnix')
   call assert_equal(["getreg('=', 1)", '5000', "FOOBAR eins zwei", "FOOBAR eins zwei"], getline(1, '$'))
-  call test_override("ALL", 0)
+  " call test_override("ALL", 0)
   set noshowcmd
   bw!
 endfunc
@@ -957,7 +956,6 @@ func! Test_edit_DROP()
 endfunc
 
 func! Test_edit_CTRL_V()
-  throw 'skipped: Nvim does not support test_override()'
   if has("ebcdic")
     return
   endif
@@ -967,7 +965,7 @@ func! Test_edit_CTRL_V()
   " force some redraws
   set showmode showcmd
   "call test_override_char_avail(1)
-  call test_override('ALL', 1)
+  " call test_override('ALL', 1)
   call feedkeys("A\<c-v>\<c-n>\<c-v>\<c-l>\<c-v>\<c-b>\<esc>", 'tnix')
   call assert_equal(["abc\x0e\x0c\x02"], getline(1, '$'))
 
@@ -980,7 +978,7 @@ func! Test_edit_CTRL_V()
     set norl
   endif
 
-  call test_override('ALL', 0)
+  " call test_override('ALL', 0)
   set noshowmode showcmd
   bw!
 endfunc
diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim
index c29e0410a9..8fa70a5313 100644
--- a/src/nvim/testdir/test_functions.vim
+++ b/src/nvim/testdir/test_functions.vim
@@ -1222,16 +1222,16 @@ func Test_reg_executing_and_recording()
 endfunc
 
 func Test_getchar()
-  throw 'skipped: Nvim does not support test_setmouse()'
   call feedkeys('a', '')
   call assert_equal(char2nr('a'), getchar())
 
-  call test_setmouse(1, 3)
-  let v:mouse_win = 9
-  let v:mouse_winid = 9
-  let v:mouse_lnum = 9
-  let v:mouse_col = 9
-  call feedkeys("\<S-LeftMouse>", '')
+  " call test_setmouse(1, 3)
+  " let v:mouse_win = 9
+  " let v:mouse_winid = 9
+  " let v:mouse_lnum = 9
+  " let v:mouse_col = 9
+  " call feedkeys("\<S-LeftMouse>", '')
+  call nvim_input_mouse('left', 'press', 'S', 0, 0, 2)
   call assert_equal("\<S-LeftMouse>", getchar())
   call assert_equal(1, v:mouse_win)
   call assert_equal(win_getid(1), v:mouse_winid)
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index cffd80ff4f..d5ea54b764 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -233,16 +233,17 @@ func Test_timer_catch_error()
 endfunc
 
 func FeedAndPeek(timer)
-  call test_feedinput('a')
+  " call test_feedinput('a')
+  call nvim_input('a')
   call getchar(1)
 endfunc
 
 func Interrupt(timer)
-  call test_feedinput("\<C-C>")
+  " call test_feedinput("\<C-C>")
+  call nvim_input("\<C-C>")
 endfunc
 
 func Test_peek_and_get_char()
-  throw 'skipped: Nvim does not support test_feedinput()'
   if !has('unix') && !has('gui_running')
     return
   endif