diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c
index 29ca338afa..d452b0efaa 100644
--- a/src/nvim/statusline.c
+++ b/src/nvim/statusline.c
@@ -415,7 +415,7 @@ void redraw_ruler(void)
     return;
   }
 
-  // Check if cursor.lnum is valid, since win_redr_ruler() may be called
+  // Check if cursor.lnum is valid, since redraw_ruler() may be called
   // after deleting lines, before cursor.lnum is corrected.
   if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) {
     return;
diff --git a/test/functional/editor/completion_spec.lua b/test/functional/editor/completion_spec.lua
index 03d13ba3e7..7cf0e4247d 100644
--- a/test/functional/editor/completion_spec.lua
+++ b/test/functional/editor/completion_spec.lua
@@ -1376,6 +1376,7 @@ describe('completion', function()
 
   -- oldtest: Test_shortmess()
   it('shortmess+=c turns off completion messages', function()
+    command('set ruler')
     command([[call setline(1, ['hello', 'hullo', 'heee'])]])
     feed('Goh<C-N>')
     screen:expect([[
@@ -1399,7 +1400,7 @@ describe('completion', function()
       {12:hello          }{1:                                             }|
       {4:hullo          }{1:                                             }|
       {4:heee           }{1:                                             }|
-      {5:-- INSERT --}                                                |
-   ]])
+      {5:-- INSERT --}                              4,6           All |
+    ]])
   end)
 end)
diff --git a/test/old/testdir/test_popup.vim b/test/old/testdir/test_popup.vim
index 81f18631e9..cb2baf74b4 100644
--- a/test/old/testdir/test_popup.vim
+++ b/test/old/testdir/test_popup.vim
@@ -220,7 +220,6 @@ func Test_popup_complete()
   set completeopt&
 endfunc
 
-
 func Test_popup_completion_insertmode()
   new
   inoremap <F5> <C-R>=ListMonths()<CR>