diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 64104ab..e737aea 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -452,14 +452,21 @@
 endfunction
 
 func Test_terminal_noblock()
-  let buf = term_start(&shell)
+  let g:buf = term_start(&shell)
 
   for c in ['a','b','c','d','e','f','g','h','i','j','k']
-    call term_sendkeys(buf, 'echo ' . repeat(c, 5000) . "\<cr>")
+    call term_sendkeys(g:buf, 'echo ' . repeat(c, 5000) . "\<cr>")
   endfor
+  call term_sendkeys(g:buf, "echo done\<cr>")
+  let g:lnum = term_getsize(g:buf)[0] - 1
+  call WaitFor('term_getline(g:buf, g:lnum) =~ "done"', 3000)
+  call assert_match('done', term_getline(g:buf, g:lnum))
 
-  let g:job = term_getjob(buf)
-  call Stop_shell_in_terminal(buf)
-  call term_wait(buf)
+  let g:job = term_getjob(g:buf)
+  call Stop_shell_in_terminal(g:buf)
+  call term_wait(g:buf)
+  unlet g:buf
+  unlet g:job
+  unlet g:lnum
   bwipe
 endfunc
diff --git a/src/version.c b/src/version.c
index 1ba0073..e6626cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    963,
+/**/
     962,
 /**/
     961,