diff --git a/src/testdir/README.txt b/src/testdir/README.txt
index 534f05f..3b2e101 100644
--- a/src/testdir/README.txt
+++ b/src/testdir/README.txt
@@ -3,11 +3,12 @@
 If it makes sense, add a new test method to an already existing file.  You may
 want to separate it from other tests with comment lines.
 
-The numbered tests are older, we have switched to named tests.
+The numbered tests are older, we have switched to named tests.  Don't add any
+more numbered tests.
 
 And then you can choose between a new style test, which is a Vim script, or an
 old style test, which uses Normal mode commands.  Use a new style test if you
-can.
+can.  Use an old style test when it needs to run without the +eval feature.
 
 
 TO ADD A NEW STYLE TEST:
diff --git a/src/testdir/test_backspace_opt.vim b/src/testdir/test_backspace_opt.vim
index 7fbba96..fd81f42 100644
--- a/src/testdir/test_backspace_opt.vim
+++ b/src/testdir/test_backspace_opt.vim
@@ -56,4 +56,4 @@
   set nocompatible viminfo+=nviminfo
 endfunc
 
-" vim: tabstop=2 shiftwidth=0 expandtab
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
index 9550085..6290680 100644
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -458,4 +458,4 @@
   call assert_equal("€", s)
 endfunc
 
-" vim: tabstop=2 shiftwidth=0 sts=-1 expandtab
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_gn.vim b/src/testdir/test_gn.vim
index 3eca99b..7a5cdab 100644
--- a/src/testdir/test_gn.vim
+++ b/src/testdir/test_gn.vim
@@ -90,4 +90,4 @@
   sil! %d _
 endfu
 
-" vim: tabstop=2 shiftwidth=0 expandtab
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_help_tagjump.vim b/src/testdir/test_help_tagjump.vim
index 0f14ade..778bd9c 100644
--- a/src/testdir/test_help_tagjump.vim
+++ b/src/testdir/test_help_tagjump.vim
@@ -150,4 +150,4 @@
   endtry
 endfunc
 
-" vim: et sw=2:
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_increment.vim b/src/testdir/test_increment.vim
index e53b569..8bfd95d 100644
--- a/src/testdir/test_increment.vim
+++ b/src/testdir/test_increment.vim
@@ -757,4 +757,4 @@
 endfunc
 
 
-" vim: tabstop=2 shiftwidth=2 expandtab
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_increment_dbcs.vim b/src/testdir/test_increment_dbcs.vim
index e1b6632..dea405c 100644
--- a/src/testdir/test_increment_dbcs.vim
+++ b/src/testdir/test_increment_dbcs.vim
@@ -27,4 +27,4 @@
   call assert_equal([0, 1, 10, 0], getpos('.'))
 endfunc
 
-" vim: shiftwidth=2 expandtab
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_match.vim b/src/testdir/test_match.vim
index 67f3ea7..0008936 100644
--- a/src/testdir/test_match.vim
+++ b/src/testdir/test_match.vim
@@ -186,4 +186,4 @@
   set hlsearch&
 endfunc
 
-" vim: et ts=2 sw=2
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_regexp_latin.vim b/src/testdir/test_regexp_latin.vim
index ea3b2e7..b3d258e 100644
--- a/src/testdir/test_regexp_latin.vim
+++ b/src/testdir/test_regexp_latin.vim
@@ -38,4 +38,3 @@
   call setwinvar(1, 'myvar', 1)
   bwipe!
 endfunc
-
diff --git a/src/testdir/test_tagjump.vim b/src/testdir/test_tagjump.vim
index 97d86e6..b22bde8 100644
--- a/src/testdir/test_tagjump.vim
+++ b/src/testdir/test_tagjump.vim
@@ -7,4 +7,4 @@
   set tagstack&vim
 endfunc
 
-" vim: sw=2 et
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index f334c17..46777d1 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -112,4 +112,4 @@
   call assert_inrange(0, 10, slept)
 endfunc
 
-" vim: ts=2 sw=0 et
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index b7f41a7..569a78a 100644
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -67,4 +67,4 @@
   augroup! test_window_cmd_wincmd_gf
 endfunc
 
-" vim: sw=2 et
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 06aeb29..6486e6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2228,
+/**/
     2227,
 /**/
     2226,