diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index ccd22e89fa..1d70a90f05 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -208,6 +208,7 @@ endfunc
 for name in s:GetSwapFileList()
   call delete(name)
 endfor
+unlet name
 
 
 " Invoked when a test takes too much time.
diff --git a/src/version.c b/src/version.c
index 288164a4ee..10e56c1393 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1021,
 /**/
     1020,
 /**/