diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 3254db8..d762c91 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -1100,6 +1100,7 @@
 
   " Cleanup
   au! OptionSet
+  " set tags&
   for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp', 'backupext', 'tags', 'spelllang', 'statusline', 'foldignore', 'cmdheight', 'undolevels', 'wrapmargin', 'foldcolumn', 'wrapscan', 'autoread', 'cindent', 'cursorcolumn']
     exe printf(":set %s&vim", opt)
   endfor
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 3b275b6..f0d83c6 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -378,6 +378,7 @@
   endfor
 
   call delete('Xtags')
+  set tags&
 
   call assert_fails('call getcompletion("", "burp")', 'E475:')
 endfunc
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 9d3065d..e8eaef0 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -237,6 +237,7 @@
 
   call feedkeys(":set tags=./\\\\ dif\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"set tags=./\\ diff diffexpr diffopt', @:)
+  set tags&
 endfunc
 
 func Test_set_errors()
diff --git a/src/testdir/test_tagcase.vim b/src/testdir/test_tagcase.vim
index 83e5328..08782b3 100644
--- a/src/testdir/test_tagcase.vim
+++ b/src/testdir/test_tagcase.vim
@@ -44,6 +44,7 @@
   endfor
 
   call delete('Xtags')
+  set tags&
   set ic&
   setg tc&
   setl tc&
diff --git a/src/testdir/test_tagjump.vim b/src/testdir/test_tagjump.vim
index 7e64ac4..e4084b3 100644
--- a/src/testdir/test_tagjump.vim
+++ b/src/testdir/test_tagjump.vim
@@ -20,6 +20,7 @@
   call assert_equal(2, winnr('$'))
 
   call delete('Xtags')
+  set tags&
   quit
 endfunc
 
@@ -104,6 +105,7 @@
   enew | only
   call delete('Xfile1')
   call delete('Xtags')
+  set tags&
   set switchbuf&vim
 endfunc
 
@@ -431,7 +433,7 @@
   tag
   call assert_equal(bufname('%'), 'Xtest.h')
 
-  set tag&
+  set tags&
   call delete('Xtags')
   bwipe Xtest.h
   bwipe Xtest.c
@@ -467,6 +469,7 @@
   endtry
   call assert_equal('Ignoring long line in tags file', split(execute('messages'), '\n')[-1])
   call delete('Xtags')
+  set tags&
   let &verbose = old_vbs
 endfunc
 
diff --git a/src/testdir/test_taglist.vim b/src/testdir/test_taglist.vim
index 6506c3f..9ddefc5 100644
--- a/src/testdir/test_taglist.vim
+++ b/src/testdir/test_taglist.vim
@@ -30,6 +30,7 @@
   call assert_equal('call cursor(3, 4)', cmd[0]['cmd'])
 
   call delete('Xtags')
+  set tags&
   bwipe
 endfunc
 
@@ -50,6 +51,7 @@
 	\ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]}))
 
   call delete('Xtags')
+  set tags&
 endfunc
 
 func Test_taglist_ctags_etags()
@@ -69,6 +71,7 @@
 	\ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]}))
 
   call delete('Xtags')
+  set tags&
 endfunc
 
 func Test_tags_too_long()
@@ -110,4 +113,5 @@
   call assert_equal('Foo', tl[0].name)
 
   call delete('Xtags')
+  set tags&
 endfunc
diff --git a/src/version.c b/src/version.c
index 51101f8..675beb8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1546,
+/**/
     1545,
 /**/
     1544,