diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index b1068bfc7b8..9185371b523 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -65,7 +65,7 @@
 
 ;;; Constants
 
-(defconst js--name-start-re (concat "[a-zA-Z_$]")
+(defconst js--name-start-re (concat "[[:alpha:]_$]")
   "Regexp matching the start of a JavaScript identifier, without grouping.")
 
 (defconst js--stmt-delim-chars "^;{}?:")
diff --git a/test/manual/indent/jsx-unclosed-2.jsx b/test/manual/indent/jsx-unclosed-2.jsx
index be0a605503f..fb665b96a43 100644
--- a/test/manual/indent/jsx-unclosed-2.jsx
+++ b/test/manual/indent/jsx-unclosed-2.jsx
@@ -56,3 +56,10 @@ while (await foo > bar) void 0
       / >
   < / div>
 < / div >
+
+// Non-ASCII identifiers are acceptable.
+<Über>
+  <Québec διακριτικός sueño="">
+    Guten Tag!
+  </Québec>
+</Über>