diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 80a14595e0..9fb51abd76 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2454,10 +2454,9 @@ func Test_popupwin_terminal_buffer()
   call term_sendkeys(termbuf2, "exit\<CR>")
 
   " Exiting shell closes popup window
-  let pupwin = win_getid()
   call feedkeys("exit\<CR>", 'xt')
   " Wait for shell to exit
-  call WaitForAssert({-> assert_notequal(pupwin, win_getid())})
+  call WaitForAssert({-> assert_equal("dead", job_status(term_getjob(termbuf)))})
 
   call feedkeys(":quit\<CR>", 'xt')
   call assert_equal(origwin, win_getid())
diff --git a/src/version.c b/src/version.c
index 43b1010809..b383830c95 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1038,
 /**/
     1037,
 /**/