diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 80d51c3..5896645 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -81,7 +81,11 @@
 " Stop a Vim running in terminal buffer "buf".
 func StopVimInTerminal(buf)
   call assert_equal("running", term_getstatus(a:buf))
-  call term_sendkeys(a:buf, "\<Esc>:qa!\<cr>")
+
+  " CTRL-O : works both in Normal mode and Insert mode to start a command line.
+  " In Command-line it's inserted, the CTRL-U removes it again.
+  call term_sendkeys(a:buf, "\<C-O>\<C-U>:qa!\<cr>")
+
   call WaitForAssert({-> assert_equal("finished", term_getstatus(a:buf))})
   only!
 endfunc
diff --git a/src/testdir/test_prompt_buffer.vim b/src/testdir/test_prompt_buffer.vim
index 3a0469d..f7363d9 100644
--- a/src/testdir/test_prompt_buffer.vim
+++ b/src/testdir/test_prompt_buffer.vim
@@ -34,9 +34,12 @@
 	\ 'func TimerFunc(text)',
 	\ '  " Add the output above the current prompt.',
 	\ '  call append(line("$") - 1, "Result: \"" . a:text . "\"")',
+	\ '  " Reset &modified to allow the buffer to be closed.',
+	\ '  set nomodified',
 	\ 'endfunc',
 	\ '',
 	\ 'call setline(1, "other buffer")',
+	\ 'set nomodified',
 	\ 'new',
 	\ 'set buftype=prompt',
 	\ 'call prompt_setcallback(bufnr(""), function("TextEntered"))',
diff --git a/src/version.c b/src/version.c
index 70fd603..d13bcfd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    30,
+/**/
     29,
 /**/
     28,