3 files changed, 5 insertions, 20 deletions
diff --git a/test/old/testdir/test_mksession.vim b/test/old/testdir/test_mksession.vim
index 972397cb91..f60d89faae 100644
--- a/test/old/testdir/test_mksession.vim
+++ b/test/old/testdir/test_mksession.vim
@@ -943,15 +943,16 @@ func Test_mkvimrc()
 
   " the 'pastetoggle', 'wildchar' and 'wildcharm' option values should be
   " stored as key names in the vimrc file
-  set pastetoggle=<F5>
+  " set pastetoggle=<F5>
   set wildchar=<F6>
   set wildcharm=<F7>
   call assert_fails('mkvimrc Xtestvimrc')
   mkvimrc! Xtestvimrc
-  call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set pastetoggle=<F5>'))
+  " call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set pastetoggle=<F5>'))
   call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set wildchar=<F6>'))
   call assert_notequal(-1, index(readfile('Xtestvimrc'), 'set wildcharm=<F7>'))
-  set pastetoggle& wildchar& wildcharm&
+  " set pastetoggle& wildchar& wildcharm&
+  set wildchar& wildcharm&
 
   call delete('Xtestvimrc')
 endfunc
diff --git a/test/old/testdir/test_options.vim b/test/old/testdir/test_options.vim
index b6b982e92e..d18802adc1 100644
--- a/test/old/testdir/test_options.vim
+++ b/test/old/testdir/test_options.vim
@@ -49,6 +49,7 @@ endfunc
 
 " Test for getting the value of 'pastetoggle'
 func Test_pastetoggle()
+  throw "Skipped: 'pastetoggle' is removed from Nvim"
   " character with K_SPECIAL byte
   let &pastetoggle = '…'
   call assert_equal('…', &pastetoggle)
diff --git a/test/old/testdir/test_paste.vim b/test/old/testdir/test_paste.vim
index 923f4f42a6..9ed3adca9b 100644
--- a/test/old/testdir/test_paste.vim
+++ b/test/old/testdir/test_paste.vim
@@ -1,21 +1,4 @@
 
-" Test for 'pastetoggle'
-func Test_pastetoggle()
-  new
-  set pastetoggle=<F4>
-  set nopaste
-  call feedkeys("iHello\<F4>", 'xt')
-  call assert_true(&paste)
-  call feedkeys("i\<F4>", 'xt')
-  call assert_false(&paste)
-  call assert_equal('Hello', getline(1))
-  " command-line completion for 'pastetoggle' value
-  call feedkeys(":set pastetoggle=\<Tab>\<C-B>\"\<CR>", 'xt')
-  call assert_equal('"set pastetoggle=<F4>', @:)
-  set pastetoggle&
-  bwipe!
-endfunc
-
 " Test for restoring option values when 'paste' is disabled
 func Test_paste_opt_restore()
   set autoindent expandtab ruler showmatch