diff --git a/src/testdir/test103.in b/src/testdir/test103.in
index 7c7591e..a4c8084 100644
--- a/src/testdir/test103.in
+++ b/src/testdir/test103.in
@@ -1,6 +1,7 @@
 Test for visual mode not being reset causing E315 error.
 STARTTEST
 :so small.vim
+:set belloff=all
 :enew
 :let g:msg="Everything's fine."
 :function! TriggerTheProblem()
diff --git a/src/testdir/test14.in b/src/testdir/test14.in
index fb987eb..3fc39fe 100644
--- a/src/testdir/test14.in
+++ b/src/testdir/test14.in
@@ -6,6 +6,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 /Start cursor here
 vaBiBD:?Bug?,/Piece/-2w! test.out
 /^- Bug
diff --git a/src/testdir/test29.in b/src/testdir/test29.in
index 65e28c1..366a551 100644
--- a/src/testdir/test29.in
+++ b/src/testdir/test29.in
Binary files differ
diff --git a/src/testdir/test30.in b/src/testdir/test30.in
index 70bedc5..df49404 100644
--- a/src/testdir/test30.in
+++ b/src/testdir/test30.in
Binary files differ
diff --git a/src/testdir/test32.in b/src/testdir/test32.in
index 6b399fa..602d9e5 100644
--- a/src/testdir/test32.in
+++ b/src/testdir/test32.in
@@ -23,6 +23,7 @@
 STARTTEST
 :so small.vim
 :se nocp viminfo+=nviminfo cpt=.,w ff=unix | $-2,$w!Xtestfile | set ff&
+:set belloff=all
 :se cot=
 nO#include "Xtestfile"
 ru
diff --git a/src/testdir/test45.in b/src/testdir/test45.in
index b1e8266..751e137 100644
--- a/src/testdir/test45.in
+++ b/src/testdir/test45.in
@@ -2,6 +2,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 :" We also need the +syntax feature here.
 :if !has("syntax")
    e! test.ok
diff --git a/src/testdir/test72.in b/src/testdir/test72.in
index a407eea..961df4c 100644
--- a/src/testdir/test72.in
+++ b/src/testdir/test72.in
@@ -4,6 +4,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 :"
 :" Test 'undofile': first a simple one-line change.
 :set nocompatible viminfo+=nviminfo visualbell
@@ -25,7 +26,6 @@
 :set undofile
 :bwipe!
 :e Xtestfile
-:" TODO: this beeps
 u:.w >>test.out
 :"
 :" Test 'undofile', add 10 lines, delete 6 lines, undo 3
diff --git a/src/testdir/test73.in b/src/testdir/test73.in
index a0b9ae8..67fe455 100644
--- a/src/testdir/test73.in
+++ b/src/testdir/test73.in
@@ -2,6 +2,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 :" Do all test in a separate window to avoid E211 when we recursively
 :" delete the Xfind directory during cleanup
 :"
diff --git a/src/testdir/test77.in b/src/testdir/test77.in
index 0dbc4fc..55a1c30 100644
--- a/src/testdir/test77.in
+++ b/src/testdir/test77.in
@@ -10,6 +10,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 :if !executable("cksum")
 : e! test.ok
 : w! test.out
diff --git a/src/testdir/test78.in b/src/testdir/test78.in
index 1850bd9..e97f4a4 100644
--- a/src/testdir/test78.in
+++ b/src/testdir/test78.in
@@ -6,7 +6,7 @@
 
 STARTTEST
 :so small.vim
-:set nocp fileformat=unix undolevels=-1 viminfo+=nviminfo
+:set nocp fileformat=unix undolevels=-1 viminfo+=nviminfo belloff=all
 :e! Xtest
 ggdG
 :let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
diff --git a/src/testdir/test85.in b/src/testdir/test85.in
index c5ca873..0a13394 100644
--- a/src/testdir/test85.in
+++ b/src/testdir/test85.in
@@ -2,6 +2,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 :so lua.vim
 :set nocompatible viminfo+=nviminfo
 :lua l = vim.list():add"item0":add"dictionary with list OK":add"item2"
diff --git a/src/testdir/test94.in b/src/testdir/test94.in
index 238fef3..447fd2b 100644
--- a/src/testdir/test94.in
+++ b/src/testdir/test94.in
Binary files differ
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 4ccff8a..8cbd601 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -1,6 +1,7 @@
 " 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_autocmd.vim
 source test_changedtick.vim
diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim
index 90b2aab..3022da3 100644
--- a/src/testdir/test_alot_utf8.vim
+++ b/src/testdir/test_alot_utf8.vim
@@ -5,6 +5,7 @@
 " 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_expr_utf8.vim
 source test_matchadd_conceal_utf8.vim
 source test_regexp_utf8.vim
diff --git a/src/testdir/test_close_count.in b/src/testdir/test_close_count.in
index f07da99..f40fd23 100644
--- a/src/testdir/test_close_count.in
+++ b/src/testdir/test_close_count.in
@@ -2,6 +2,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 :let tests = []
 :for i in range(5)
 :new
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 8d5ae28..98a4337 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1,5 +1,7 @@
 " Tests for editing the command line.
 
+set belloff=all
+
 func Test_complete_tab()
   call writefile(['testfile'], 'Xtestfile')
   call feedkeys(":e Xtest\t\r", "tx")
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 33617c9..73f944b 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -1,4 +1,5 @@
 " 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 6290680..30dc9a4 100644
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -3,6 +3,7 @@
 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_erasebackword.in b/src/testdir/test_erasebackword.in
index 1ddcd3c..36dd232 100644
--- a/src/testdir/test_erasebackword.in
+++ b/src/testdir/test_erasebackword.in
@@ -2,6 +2,7 @@
 
 STARTTEST
 :so small.vim
+:set belloff=all
 :so mbyte.vim
 :set encoding=utf-8
 G
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 3af79f8..e0df0ae 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1,5 +1,6 @@
 " 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 8ffebf9..9d4c6d8 100644
--- a/src/testdir/test_packadd.vim
+++ b/src/testdir/test_packadd.vim
@@ -1,5 +1,7 @@
 " Tests for 'packpath' and :packadd
 
+set belloff=all
+
 func SetUp()
   let s:topdir = expand('%:h') . '/Xdir'
   exe 'set packpath=' . s:topdir
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 1a114c4..7f4f7e0 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1,5 +1,6 @@
 " 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 630ae5d..5e67f25 100644
--- a/src/testdir/test_textobjects.vim
+++ b/src/testdir/test_textobjects.vim
@@ -4,6 +4,7 @@
   finish
 endif
 
+set belloff=all
 function! CpoM(line, useM, expected)
   new
 
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index 06732af..e785c60 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -3,6 +3,7 @@
 " 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 9420321..29db51f 100644
--- a/src/testdir/test_usercommands.vim
+++ b/src/testdir/test_usercommands.vim
@@ -1,6 +1,7 @@
 " 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 227da87..371fab5 100644
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -3,6 +3,8 @@
   finish
 endif
 
+set belloff=all
+
 func Test_block_shift_multibyte()
   " Uses double-wide character.
   if !has('multi_byte')
diff --git a/src/version.c b/src/version.c
index 3415d22..cbb1bba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    433,
+/**/
     432,
 /**/
     431,