diff --git a/src/testdir/test_gn.vim b/src/testdir/test_gn.vim
index d0fdafc..fc7e891 100644
--- a/src/testdir/test_gn.vim
+++ b/src/testdir/test_gn.vim
@@ -2,7 +2,7 @@
 
 func Test_gn_command()
   noautocmd new
-  " replace a single char by itsself quoted:
+  " replace a single char by itself quoted:
   call setline('.', 'abc x def x ghi x jkl')
   let @/ = 'x'
   exe "norm! cgn'x'\<esc>.."
diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index ce5a9ee..c7e38ae 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -97,7 +97,7 @@
   if has('unix') && has('gui') && !has('gui_running')
     let @* = ''
 
-    " Running in a terminal and the GUI is avaiable: Tell the server to open
+    " Running in a terminal and the GUI is available: Tell the server to open
     " the GUI and check that the remote command still works.
     " Need to wait for the GUI to start up, otherwise the send hangs in trying
     " to send to the terminal window.
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index ebcc8e1..1b8653e 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -163,5 +163,7 @@
   bwipe!
   if exists('save_F2')
     let t_F2 = save_F2
+  else
+    set t_F2=
   endif
 endfunc
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index c0be4a0..143f97a 100644
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -34,7 +34,7 @@
 	\ 'CREATE TABLE FOOBAR(',
 	\ '    DLTD_BY VARCHAR2(100)',
 	\ ');',
-  	\ ''])
+	\ ''])
 
   syntax on
   set ft=sql
@@ -519,7 +519,7 @@
 
   norm f/
   call assert_equal(['cComment', 'cCommentStart'], map(synstack(line("."), col(".")), 'synIDattr(v:val, "name")'))
-  call assert_equal(['Comment', 'Comment'],        map(synstack(line("."), col(".")), 'synIDattr(synIDtrans(v:val), "name")'))
+  call assert_equal(['Comment', 'Comment'],	   map(synstack(line("."), col(".")), 'synIDattr(synIDtrans(v:val), "name")'))
 
   norm fA
   call assert_equal(['cComment'], map(synstack(line("."), col(".")), 'synIDattr(v:val, "name")'))
diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim
index 48ac6eb..2eae3de 100644
--- a/src/testdir/test_tabpage.vim
+++ b/src/testdir/test_tabpage.vim
@@ -140,9 +140,6 @@
 
 " Test autocommands
 function Test_tabpage_with_autocmd()
-  if !has('autocmd')
-    return
-  endif
   command -nargs=1 -bar C :call add(s:li, '=== ' . <q-args> . ' ===')|<args>
   augroup TestTabpageGroup
     au!
diff --git a/src/testdir/test_vartabs.vim b/src/testdir/test_vartabs.vim
index 0d14aad..df61c0e 100644
--- a/src/testdir/test_vartabs.vim
+++ b/src/testdir/test_vartabs.vim
@@ -5,6 +5,7 @@
 endif
 
 source view_util.vim
+
 func s:compare_lines(expect, actual)
   call assert_equal(join(a:expect, "\n"), join(a:actual, "\n"))
 endfunc
@@ -372,3 +373,9 @@
   call assert_fails('set vts=,8')
   call assert_fails('set vsts=,8')
 endfunc
+
+func Test_vartabs_reset()
+  set vts=8
+  set all&
+  call assert_equal('', &vts)
+endfunc
diff --git a/src/version.c b/src/version.c
index 2448efd..e6de24b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1193,
+/**/
     1192,
 /**/
     1191,