diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim
index c2a2c35..cfc850b 100644
--- a/src/testdir/term_util.vim
+++ b/src/testdir/term_util.vim
@@ -134,7 +134,7 @@
 endfunc
 
 " Stop a Vim running in terminal buffer "buf".
-func StopVimInTerminal(buf)
+func StopVimInTerminal(buf, kill = 1)
   " Using a terminal to run Vim is always considered flaky.
   let g:test_is_flaky = 1
 
@@ -151,7 +151,7 @@
   call WaitForAssert({-> assert_equal("finished", term_getstatus(a:buf))})
 
   " If the buffer still exists forcefully wipe it.
-  if bufexists(a:buf)
+  if a:kill && bufexists(a:buf)
     exe a:buf .. 'bwipe!'
   endif
 endfunc
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 829706c..f5b99bc 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1230,7 +1230,7 @@
   call assert_fails("call term_dumpwrite(buf, '')", 'E482:')
   call assert_fails("call term_dumpwrite(buf, test_null_string())", 'E482:')
   call test_garbagecollect_now()
-  call StopVimInTerminal(buf)
+  call StopVimInTerminal(buf, 0)
   call TermWait(buf)
   call assert_fails("call term_dumpwrite(buf, 'Xtest.dump')", 'E958:')
   call assert_fails('call term_sendkeys([], ":q\<CR>")', 'E745:')
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
index a3b8c1c..db6ebc0 100644
--- a/src/testdir/test_terminal3.vim
+++ b/src/testdir/test_terminal3.vim
@@ -560,7 +560,6 @@
   call TermWait(buf)
   call term_sendkeys(buf, ":q\<CR>")
   call StopVimInTerminal(buf)
-  exe buf . 'bwipe!'
   set splitright&
   only!
 endfunc