diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index 27ae5539b2..551370bcbd 100644
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -258,9 +258,9 @@ func Assert_regput(name, result)
   new
   execute "silent normal! o==\n==\e\"" . a:name . "P"
   call assert_equal(a:result, getline(2, line('$')))
+  bwipe!
 endfunc
 
-
 func Test_setreg_basic()
   call setreg('a', 'abcA', 'c')
   call Assert_reg('a', 'v', "abcA", "['abcA']", "abcA", "['abcA']")
@@ -351,8 +351,5 @@ func Test_setreg_basic()
   call Assert_regput('I', ['==', '=abcI='])
 endfunc
 
-func Test_setreg_append_NL()
-endfunc
-
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 075f4db269..ae915db32c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    598,
 /**/
     597,
 /**/