diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index ffb7a20..7c71edc 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -493,10 +493,30 @@
   call term_sendkeys(buf, "\<Esc>:echo 'message window'\<CR>")
   call VerifyScreenDump(buf, 'Test_cmdheight_zero_3', {})
 
+  " Message for CTRL-C is in the popup window
+  "call term_sendkeys(buf, ":call popup_clear()\<CR>")
+  call term_sendkeys(buf, "\<C-C>")
+  call VerifyScreenDump(buf, 'Test_cmdheight_zero_4', {})
+
   " clean up
   call StopVimInTerminal(buf)
   call delete('XtestCmdheight')
 endfunc
 
+func Test_cmdheight_zero_shell()
+  CheckUnix
+
+  set cmdheight=0
+  set nomore
+  call setline(1, 'foo!')
+  silent !echo <cWORD> > Xfile.out
+  call assert_equal(['foo!'], readfile('Xfile.out'))
+  call delete('Xfile.out')
+  redraw!
+
+  set more&
+  set cmdheight&
+endfunc
+
 
 " vim: shiftwidth=2 sts=2 expandtab