diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 501a38856d..8beafe608b 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -372,7 +372,6 @@ local extension = {
   cs = 'cs',
   csc = 'csc',
   csdl = 'csdl',
-  cshtml = 'html',
   fdr = 'csp',
   csp = 'csp',
   css = 'css',
@@ -1068,6 +1067,8 @@ local extension = {
   MODx = 'rapid',
   rasi = 'rasi',
   rasinc = 'rasi',
+  cshtml = 'razor',
+  razor = 'razor',
   rbs = 'rbs',
   rego = 'rego',
   rem = 'remind',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index ed23301307..08159bef50 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -378,7 +378,7 @@ func s:GetFilenameChecks() abort
     \ 'hoon': ['file.hoon'],
     \ 'hostconf': ['/etc/host.conf', 'any/etc/host.conf'],
     \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'],
-    \ 'html': ['file.html', 'file.htm', 'file.cshtml', 'file.component.html'],
+    \ 'html': ['file.html', 'file.htm', 'file.component.html'],
     \ 'htmlm4': ['file.html.m4'],
     \ 'httest': ['file.htt', 'file.htb'],
     \ 'http': ['file.http'],
@@ -677,6 +677,7 @@ func s:GetFilenameChecks() abort
     \ 'rapid': ['file.sysx', 'file.Sysx', 'file.SysX', 'file.SYSx', 'file.SYSX', 'file.modx', 'file.Modx', 'file.ModX', 'file.MODx', 'file.MODX'],
     \ 'rasi': ['file.rasi', 'file.rasinc'],
     \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
+    \ 'razor': ['file.cshtml', 'file.razor'],
     \ 'rbs': ['file.rbs'],
     \ 'rc': ['file.rc', 'file.rch'],
     \ 'rcs': ['file,v'],