diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 189cd82..ad13303 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -1,7 +1,6 @@
 " A series of tests that can run in one Vim invocation.
 " This makes testing go faster, since Vim doesn't need to restart.
 
-set belloff=all
 source test_assign.vim
 source test_bufline.vim
 source test_cd.vim
diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim
index 8c9cfd2..13e227b 100644
--- a/src/testdir/test_alot_utf8.vim
+++ b/src/testdir/test_alot_utf8.vim
@@ -5,7 +5,6 @@
 " runtest.vim.  Checking for the multi_byte feature is in the individual
 " files, so that they can be run by themselves.
 
-set belloff=all
 source test_charsearch_utf8.vim
 source test_expr_utf8.vim
 source test_matchadd_conceal_utf8.vim
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 49388a1..593d1cc 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -1,6 +1,5 @@
 " Tests for autocommands
 
-set belloff=all
 
 func! s:cleanup_buffers() abort
   for bnr in range(1, bufnr('$'))
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index f9499ac..ff19082 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1,6 +1,5 @@
 " Tests for editing the command line.
 
-set belloff=all
 
 func Test_complete_tab()
   call writefile(['testfile'], 'Xtestfile')
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index c1dcfb8..3273dcb 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -1,5 +1,4 @@
 " Tests for diff mode
-set belloff=all
 
 func Test_diff_fold_sync()
   enew!
diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
index 30dc9a4..6290680 100644
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -3,7 +3,6 @@
 if !has("digraphs") || !has("multi_byte")
   finish
 endif
-set belloff=all
 
 func! Put_Dig(chars)
   exe "norm! o\<c-k>".a:chars
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index cc9540c..3fcb8a3 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -3,7 +3,6 @@
 if exists("+t_kD")
   let &t_kD="[3;*~"
 endif
-set belloff=
 
 " Needed for testing basic rightleft: Test_edit_rightleft
 source view_util.vim
@@ -26,7 +25,6 @@
   " set for Travis CI?
   "  set nocp noesckeys
   new
-  set belloff=backspace
   " 1) empty buffer
   call assert_equal([''], getline(1,'$'))
   " 2) delete in an empty line
@@ -59,7 +57,6 @@
   call cursor(1, 1)
   call feedkeys("A\<del>\<esc>", 'tnix')
   call assert_equal(["abc def", "ghi jkl"], getline(1, 2))
-  set belloff=
   let &bs=_bs
   bw!
 endfunc
@@ -475,13 +472,11 @@
   new
   call setline(1, repeat([''], 5))
   call cursor(1, 1)
-  set belloff=all
   try
     call feedkeys("A\<NUL>", 'tnix')
   catch /^Vim\%((\a\+)\)\=:E29/
     call assert_true(1, 'E29 error caught')
   endtry
-  set belloff=
   call cursor(1, 1)
   call feedkeys("Afoobar \<esc>", 'tnix')
   call cursor(2, 1)
@@ -510,7 +505,6 @@
 
 func! Test_edit_CTRL_G()
   new
-  set belloff=all
   call setline(1, ['foobar', 'foobar', 'foobar'])
   call cursor(2, 4)
   call feedkeys("ioooooooo\<c-g>k\<c-r>.\<esc>", 'tnix')
@@ -524,7 +518,6 @@
   call assert_equal([0, 3, 7, 0], getpos('.'))
   call feedkeys("i\<c-g>j\<esc>", 'tnix')
   call assert_equal([0, 3, 6, 0], getpos('.'))
-  set belloff=
   bw!
 endfunc
 
@@ -604,7 +597,6 @@
   %d
   call setline(1, 'A')
   call cursor(1, 1)
-  set belloff=all
   let v:testing = 1
   try
     call feedkeys("A\<c-x>\<c-k>\<esc>", 'tnix')
@@ -612,7 +604,6 @@
     " error sleeps 2 seconds, when v:testing is not set
     let v:testing = 0
   endtry
-  set belloff=
   call delete('Xdictionary.txt')
 
   if has("multi_byte")
@@ -853,7 +844,6 @@
   %d
   call setline(1, 'mad')
   call cursor(1, 1)
-  set belloff=all
   let v:testing = 1
   try
     call feedkeys("A\<c-x>\<c-t>\<esc>", 'tnix')
@@ -861,7 +851,6 @@
     " error sleeps 2 seconds, when v:testing is not set
     let v:testing = 0
   endtry
-  set belloff=
   call assert_equal(['mad'], getline(1, '$'))
   call delete('Xthesaurus')
   bw!
@@ -1033,7 +1022,6 @@
 func! Test_edit_LEFT_RIGHT()
   " Left, Shift-Left, Right, Shift-Right
   new
-  set belloff=all
   call setline(1, ['abc def ghi', 'ABC DEF GHI', 'ZZZ YYY XXX'])
   let _ww=&ww
   set ww=
@@ -1075,7 +1063,6 @@
   call feedkeys("A\<s-right>\<esc>", 'tnix')
   call assert_equal([0, 3, 1, 0], getpos('.'))
   let &ww = _ww
-  set belloff=
   bw!
 endfunc
 
@@ -1135,7 +1122,6 @@
 endfunc
 
 func! Test_edit_PAGEUP_PAGEDOWN()
-  set belloff=all
   10new
   call setline(1, repeat(['abc def ghi'], 30))
   call cursor(1, 1)
@@ -1231,12 +1217,10 @@
   call assert_equal([0, 30, 11, 0], getpos('.'))
   call feedkeys("A\<S-Down>\<esc>", 'tnix')
   call assert_equal([0, 30, 11, 0], getpos('.'))
-  set startofline belloff=
   bw!
 endfunc
 
 func! Test_edit_forbidden()
-  set belloff=error,esc
   new
   " 1) edit in the sandbox is not allowed
   call setline(1, 'a')
@@ -1293,7 +1277,6 @@
       set norevins nofkmap
     endtry
   endif
-  set belloff=
   bw!
 endfunc
 
diff --git a/src/testdir/test_file_size.vim b/src/testdir/test_file_size.vim
index 8dac3b2..3e78a7b 100644
--- a/src/testdir/test_file_size.vim
+++ b/src/testdir/test_file_size.vim
@@ -13,7 +13,7 @@
   endif
 
   new
-  set belloff=all fileformat=unix undolevels=-1
+  set fileformat=unix undolevels=-1
   for i in range(1, 2000000, 100)
       call append(i, range(i, i + 99))
   endfor
@@ -26,7 +26,7 @@
 
   enew!
   call delete('Xtest')
-  set belloff& fileformat& undolevels&
+  set fileformat& undolevels&
 endfunc
 
 " Test for writing and reading a file of over 100 Kbyte
diff --git a/src/testdir/test_gn.vim b/src/testdir/test_gn.vim
index f56e707..7a77d9d 100644
--- a/src/testdir/test_gn.vim
+++ b/src/testdir/test_gn.vim
@@ -1,7 +1,6 @@
 " Test for gn command
 
 func Test_gn_command()
-  set belloff=all
   noautocmd new
   " replace a single char by itsself quoted:
   call setline('.', 'abc x def x ghi x jkl')
@@ -121,7 +120,6 @@
   sil! %d_
 
   set wrapscan&vim
-  set belloff&vim
 endfu
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index b64b4e4..f6b1a43 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1,6 +1,5 @@
 " Test for various Normal mode commands
 
-set belloff=all
 func! Setup_NewWindow()
   10new
   call setline(1, range(1,100))
diff --git a/src/testdir/test_packadd.vim b/src/testdir/test_packadd.vim
index 7dcaa60..66cbb47 100644
--- a/src/testdir/test_packadd.vim
+++ b/src/testdir/test_packadd.vim
@@ -1,6 +1,5 @@
 " Tests for 'packpath' and :packadd
 
-set belloff=all
 
 func SetUp()
   let s:topdir = expand('%:h') . '/Xdir'
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 917395b..b770e56 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -38,7 +38,6 @@
 func! Test_popup_complete()
   new
   inoremap <f5> <c-r>=ListMonths()<cr>
-  set belloff=all
 
   " <C-E> - select original typed text before the completion started
   call feedkeys("aJu\<f5>\<down>\<c-e>\<esc>", 'tx')
@@ -215,7 +214,6 @@
   call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
   call assert_equal(["March", "M", "March"], getline(1,4))
   %d
-  set belloff&
 endfu
 
 
@@ -517,7 +515,6 @@
 
 func Test_completion_respect_bs_option()
   new
-  set belloff=all
   let li = ["aaa", "aaa12345", "aaaabcdef", "aaaABC"]
 
   set bs=indent,eol
@@ -533,7 +530,6 @@
   call feedkeys("A\<C-X>\<C-N>\<C-P>\<BS>\<BS>\<BS>\<Esc>", "tx")
   call assert_equal('', getline(1))
 
-  set belloff&
   bw!
 endfunc
 
@@ -620,7 +616,6 @@
 
 func Test_complete_CTRLN_startofbuffer()
   new
-  set belloff=all
   call setline(1, [ 'organize(cupboard, 3, 2);',
         \ 'prioritize(bureau, 8, 7);',
         \ 'realize(bannister, 4, 4);',
@@ -631,7 +626,6 @@
         \ 'railing.moralize(3,9);']
   call feedkeys("qai\<c-n>\<c-n>.\<esc>3wdW\<cr>q3@a", 'tx')
   call assert_equal(expected, getline(1,'$'))
-  set belloff&
   bwipe!
 endfunc
 
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index 6f7ff2b..a9934a1 100644
--- a/src/testdir/test_recover.vim
+++ b/src/testdir/test_recover.vim
@@ -21,7 +21,7 @@
 " We need about 10000 lines of 100 characters to get two levels of pointer
 " blocks.
 func Test_swap_file()
-  set fileformat=unix undolevels=-1 belloff=all
+  set fileformat=unix undolevels=-1
   edit! Xtest
   let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
   let i = 1
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 5ae101f..e6a46ff 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1,6 +1,5 @@
 " Test for the search command
 
-set belloff=all
 func Test_search_cmdline()
   if !exists('+incsearch')
     return
diff --git a/src/testdir/test_textobjects.vim b/src/testdir/test_textobjects.vim
index 8b92ba1..684f197 100644
--- a/src/testdir/test_textobjects.vim
+++ b/src/testdir/test_textobjects.vim
@@ -4,7 +4,6 @@
   finish
 endif
 
-set belloff=all
 func CpoM(line, useM, expected)
   new
 
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index e785c60..06732af 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -3,7 +3,6 @@
 " undo-able pieces.  Do that by setting 'undolevels'.
 " Also tests :earlier and :later.
 
-set belloff=all
 func Test_undotree()
   exe "normal Aabc\<Esc>"
   set ul=100
diff --git a/src/testdir/test_usercommands.vim b/src/testdir/test_usercommands.vim
index 29db51f..9420321 100644
--- a/src/testdir/test_usercommands.vim
+++ b/src/testdir/test_usercommands.vim
@@ -1,7 +1,6 @@
 " Tests for user defined commands
 
 " Test for <mods> in user defined commands
-set belloff=all
 function Test_cmdmods()
   let g:mods = ''
 
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index e4bd100..0e6231f 100644
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -3,7 +3,6 @@
   finish
 endif
 
-set belloff=all
 
 func Test_block_shift_multibyte()
   " Uses double-wide character.
@@ -76,7 +75,6 @@
 endfunc
 
 func Test_visual_mode_reset()
-  set belloff=all
   enew
   let g:msg="Everything's fine."
   enew
@@ -89,5 +87,5 @@
   exe "normal! GV:call TriggerTheProblem()\<CR>"
   call assert_equal("Everything's fine.", g:msg)
 
-  set belloff&
 endfunc
+
diff --git a/src/version.c b/src/version.c
index 5baff48..30a13fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1200,
+/**/
     1199,
 /**/
     1198,