diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 0256d4899..c57ec5f64 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -158,6 +158,9 @@ func FinishTesting()
   " Don't write viminfo on exit.
   set viminfo=
 
+  " Clean up files created by setup.vim
+  call delete('XfakeHOME', 'rf')
+
   if s:fail == 0
     " Success, create the .res file so that make knows it's done.
     exe 'split ' . fnamemodify(g:testname, ':r') . '.res'
diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index 4b6c08963..6299852ea 100644
--- a/src/testdir/setup.vim
+++ b/src/testdir/setup.vim
@@ -14,5 +14,7 @@ if 1
   endif
 
   " Make sure $HOME does not get read or written.
-  let $HOME = '/does/not/exist'
+  " It must exist, gnome tries to create $HOME/.gnome2
+  let $HOME = getcwd() . '/XfakeHOME'
+  call mkdir($HOME)
 endif
diff --git a/src/version.c b/src/version.c
index 0648dd6ec..ed7880c85 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 */
+/**/
+    805,
 /**/
     804,
 /**/