diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 93acf99..ccd22e8 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -161,13 +161,6 @@
 endif
 
 
-" A previous (failed) test run may have left swap files behind.  Delete them
-" before running tests again, they might interfere.
-for name in s:GetSwapFileList()
-  call delete(name)
-endfor
-
-
 " Prepare for calling test_garbagecollect_now().
 let v:testing = 1
 
@@ -210,6 +203,13 @@
   return files
 endfunc
 
+" A previous (failed) test run may have left swap files behind.  Delete them
+" before running tests again, they might interfere.
+for name in s:GetSwapFileList()
+  call delete(name)
+endfor
+
+
 " Invoked when a test takes too much time.
 func TestTimeout(id)
   split test.log
diff --git a/src/version.c b/src/version.c
index e49b0bc..288164a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1020,
+/**/
     1019,
 /**/
     1018,