diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 093b483..60c0ccb 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -47,11 +47,17 @@
   set t_Co=256 background=light
   hi Normal ctermfg=NONE ctermbg=NONE
 
+  " Make the window 20 lines high, unless told otherwise.
+  let rows = 20
+  if has_key(a:options, 'rows')
+    let rows = a:options['rows']
+  endif
+
   let cmd = GetVimCommandClean()
   " Add -v to have gvim run in the terminal (if possible)
   let cmd .= ' -v ' . a:arguments
-  let buf = term_start(cmd, {'curwin': 1, 'term_rows': 20, 'term_cols': 75})
-  call assert_equal([20, 75], term_getsize(buf))
+  let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': 75})
+  call assert_equal([rows, 75], term_getsize(buf))
 
   return buf
 endfunc
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index a7e5f61..6f65518 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1064,7 +1064,7 @@
 	\ 'redraw',
 	\ "set t_ts=",
 	\ ], 'Xscript')
-  let buf = RunVimInTerminal('-S Xscript', {})
+  let buf = RunVimInTerminal('-S Xscript', {'rows': 10})
   call WaitFor({-> expand('%:t') =='Xtextfile'})
   call assert_equal(textfile_winid, win_getid())
 
diff --git a/src/version.c b/src/version.c
index 3295eb0..c648d52 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1642,
+/**/
     1641,
 /**/
     1640,