diff --git a/ftdetect/just.vim b/ftdetect/just.vim
index b9532fd..3045e4d 100644
--- a/ftdetect/just.vim
+++ b/ftdetect/just.vim
@@ -3,5 +3,5 @@
 " Maintainer:	Noah Bogart <noah.bogart@hey.com>
 " URL:		https://github.com/NoahTheDuke/vim-just.git
 " Last Change:	2021 Aug 26
-au BufNewFile,BufRead \cjustfile,.justfile,*.just  setfiletype just
+au BufNewFile,BufRead \c{,.}justfile,\c*.just  setfiletype just
 au BufNewFile,BufRead *  if getline(1) =~# '\v^#!//@!%(\w|-|//@!)*/%(env%(\s+-S)?\s+)?just\A' | setfiletype just | endif
diff --git a/tests/cases/ftdetect.json b/tests/cases/ftdetect.json
index df9b1b8..c4b3b7f 100644
--- a/tests/cases/ftdetect.json
+++ b/tests/cases/ftdetect.json
@@ -5,9 +5,24 @@
   {
     "filename": "Justfile"
   },
+  {
+    "filename": "JUSTFILE"
+  },
+  {
+    "filename": ".justfile"
+  },
+  {
+    "filename": ".Justfile"
+  },
+  {
+    "filename": ".JUSTFILE"
+  },
   {
     "filename": "*.just"
   },
+  {
+    "filename": "*.JUST"
+  },
   {
     "content": "#!/usr/bin/env -S just -f\n"
   },