diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 3def03d7b2..a82ad8c52b 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -889,6 +889,8 @@ endfunc
 
 func TerminalTmap(remap)
   let buf = Run_shell_in_terminal({})
+  " Wait for the shell to display a prompt
+  call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
   call assert_equal('t', mode())
 
   if a:remap
diff --git a/src/version.c b/src/version.c
index b8b5d58a9a..750db2ef6e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2647,
 /**/
     2646,
 /**/