diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index 6299852ea4..31b133f10d 100644
--- a/src/testdir/setup.vim
+++ b/src/testdir/setup.vim
@@ -1,5 +1,13 @@
 " Common preparations for running tests.
 
+" Only load this once.
+if 1
+  if exists('s:did_load')
+    finish
+  endif
+  let s:did_load = 1
+endif
+
 " Make sure 'runtimepath' and 'packpath' does not include $HOME.
 set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
 if has('packages')
diff --git a/src/version.c b/src/version.c
index ed7880c856..cde101ab63 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    806,
 /**/
     805,
 /**/