diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 6131cf5732f0a4..7c9a4c64504fcc 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -2157,6 +2157,7 @@ const ft_from_ext = {
   "jgr": "jgraph",
   # Jinja
   "jinja": "jinja",
+  "j2": "jinja",
   # Jujutsu
   "jjdescription": "jjdescription",
   # Jovial
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4b10ccb63bf867..9f4e683a651e8f 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -405,7 +405,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     javascriptreact: ['file.jsx'],
     jess: ['file.clp'],
     jgraph: ['file.jgr'],
-    jinja: ['file.jinja'],
+    jinja: ['file.jinja', 'file.j2'],
     jjdescription: ['file.jjdescription'],
     jovial: ['file.jov', 'file.j73', 'file.jovial'],
     jproperties: ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],