diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 37f672fc86edae..86082adbb665ea 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -1365,8 +1365,7 @@ static bool reg_match_visual(void)
       top = curbuf->b_visual.vi_end;
       bot = curbuf->b_visual.vi_start;
     }
-    // a substitue command may have
-    // removed some lines
+    // a substitute command may have removed some lines
     if (bot.lnum > curbuf->b_ml.ml_line_count) {
       bot.lnum = curbuf->b_ml.ml_line_count;
     }
diff --git a/test/old/testdir/test_mapping.vim b/test/old/testdir/test_mapping.vim
index a5bf1a0602a958..623228b347ba38 100644
--- a/test/old/testdir/test_mapping.vim
+++ b/test/old/testdir/test_mapping.vim
@@ -108,7 +108,7 @@ func Test_map_langmap()
   unmap x
   bwipe!
 
-  " 'langnoremap' follows 'langremap' and vise versa
+  " 'langnoremap' follows 'langremap' and vice versa
   set langremap
   set langnoremap
   call assert_equal(0, &langremap)
diff --git a/test/old/testdir/test_utf8_comparisons.vim b/test/old/testdir/test_utf8_comparisons.vim
index 20b5762c9dd90b..2c1972b0871f70 100644
--- a/test/old/testdir/test_utf8_comparisons.vim
+++ b/test/old/testdir/test_utf8_comparisons.vim
@@ -93,7 +93,7 @@ func Test_gap()
   call assert_equal(["ABCD", "", "defg"], getline(1,3))
 endfunc
 
-" test that g~, ~ and gU correclty upper-cases ß
+" test that g~, ~ and gU correctly upper-cases ß
 func Test_uppercase_sharp_ss()
   new
   call setline(1, repeat(['ß'], 4))
diff --git a/test/old/testdir/test_visual.vim b/test/old/testdir/test_visual.vim
index 94b80095344a35..262a3a4fd93898 100644
--- a/test/old/testdir/test_visual.vim
+++ b/test/old/testdir/test_visual.vim
@@ -1010,7 +1010,7 @@ endfunc
 " Test for changing case
 func Test_visual_change_case()
   new
-  " gUe must uppercase a whole word, also when ß changes to SS
+  " gUe must uppercase a whole word, also when ß changes to ẞ
   exe "normal Gothe youtußeuu end\<Esc>Ypk0wgUe\r"
   " gUfx must uppercase until x, inclusive.
   exe "normal O- youßtußexu -\<Esc>0fogUfx\r"