diff --git a/src/testdir/test_winbar.vim b/src/testdir/test_winbar.vim
index fd44ac9..ada8f6b 100644
--- a/src/testdir/test_winbar.vim
+++ b/src/testdir/test_winbar.vim
@@ -4,10 +4,15 @@
   finish
 endif
 
+source shared.vim
+
 func Test_add_remove_menu()
   new
   amenu 1.10 WinBar.Next :let g:did_next = 11<CR>
   amenu 1.20 WinBar.Cont :let g:did_cont = 12<CR>
+  redraw
+  call assert_match('Next    Cont', Screenline(1))
+
   emenu WinBar.Next
   call assert_equal(11, g:did_next)
   emenu WinBar.Cont
@@ -28,6 +33,7 @@
   amenu 1.20 WinBar.Cont :let g:did_cont = 12<CR>
   amenu 1.30 WinBar.Close :close<CR>
   redraw
+  call assert_match('Next    Cont    Close', Screenline(1))
 
   let save_mouse = &mouse
   set mouse=a
@@ -38,7 +44,7 @@
   let g:did_next = 0
   let g:did_cont = 0
   for col in [1, 8, 9, 16, 17, 25, 26]
-    call test_setmouse(1, 1)
+    call test_setmouse(1, col)
     call feedkeys("\<LeftMouse>", "xt")
     call assert_equal(0, g:did_next, 'col ' .. col)
     call assert_equal(0, g:did_cont, 'col ' .. col)