diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim
index 5878b5ec36..55e874c7d6 100644
--- a/runtime/syntax/testdir/runtest.vim
+++ b/runtime/syntax/testdir/runtest.vim
@@ -117,6 +117,16 @@ for fname in glob('input/*.*', 1, 1)
       syntax on
     END
     call writefile(lines, 'Xtestscript')
+
+    " close all but the last window
+    while winnr('$') > 1
+      close
+    endwhile
+
+    " Redraw to make sure that messages are cleared and there is enough space
+    " for the terminal window.
+    redraw
+
     let buf = RunVimInTerminal('-S Xtestscript ' .. fname, {})
 
     " Screendump at the start of the file: failed/filetype_00.dump
diff --git a/src/version.c b/src/version.c
index 4f224c36bc..fed49d9584 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 */
+/**/
+    1655,
 /**/
     1654,
 /**/