diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 68013a3af..3e2a69106 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1378,7 +1378,7 @@ func Test_terminal_popup_bufload()
 endfunc
 
 func Test_terminal_popup_two_windows()
-  CheckScreendump
+  CheckRunVimInTerminal
   CheckUnix
 
   " use "sh" instead of "&shell" in the hope it will use a short prompt
@@ -1398,7 +1398,9 @@ func Test_terminal_popup_two_windows()
   call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 1))})
   call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 3))})
 
-  call term_sendkeys(buf, "\<CR>exit\<CR>:q\<CR>")
+  call term_sendkeys(buf, "\<CR>\<CR>exit\<CR>")
+  call TermWait(buf)
+  call term_sendkeys(buf, ":q\<CR>")
   call StopVimInTerminal(buf)
   call delete('XpopupScript')
 endfunc
diff --git a/src/version.c b/src/version.c
index 8f0b95491..4181019c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3802,
 /**/
     3801,
 /**/