diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index d5765d1a8b..133993d4ff 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -215,7 +215,7 @@ endfunc
 for name in s:GetSwapFileList()
   call delete(name)
 endfor
-unlet name
+unlet! name
 
 
 " Invoked when a test takes too much time.
diff --git a/src/version.c b/src/version.c
index fbf2999dd3..87502234e1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2058,
 /**/
     2057,
 /**/