diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim
index 27b766474d..5878b5ec36 100644
--- a/runtime/syntax/testdir/runtest.vim
+++ b/runtime/syntax/testdir/runtest.vim
@@ -145,9 +145,16 @@ for fname in glob('input/*.*', 1, 1)
     call StopVimInTerminal(buf)
     call delete('Xtestscript')
 
-    " Add any assert errors to s:messages
+    " redraw here to avoid the following messages to get mixed up with screen
+    " output.
+    redraw
+
+    " Add any assert errors to s:messages.
     if len(v:errors) > 0
       call extend(s:messages, v:errors)
+      " Echo the errors here, in case the script aborts or the "messages" file
+      " is not displayed later.
+      echomsg v:errors
       let v:errors = []
       let fail += 1
     endif
diff --git a/src/version.c b/src/version.c
index 6eef082b0c..33169790e7 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 */
+/**/
+    1652,
 /**/
     1651,
 /**/