diff --git a/autotests/export/latex/languages/supported-languages.lyx b/autotests/export/latex/languages/supported-languages.lyx
index 264d408bb5..8bdb02d516 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 576
+\lyxformat 589
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -18,6 +18,7 @@
 \newfontfamily\laofont[Script=Lao]{Noto Serif Lao}
 % gloss-marathi.ldf has a spelling error: "script=Devaganari"
 \newfontfamily\marathifont[Script=Devanagari]{Noto Sans Devanagari}
+% prevent spurious polyglossia error (missing script tag):
 \newfontfamily\syriacfont[Script=Syriac]{FreeSans}
 \newfontfamily\tamilfont[Script=Tamil]{Noto Serif Tamil}
 \newfontfamily\telugufont[Script=Telugu]{Noto Serif Telugu}
@@ -62,7 +63,9 @@ enumitem
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
-\font_osf false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \font_cjk gbsn
@@ -87,7 +90,7 @@ enumitem
 \pdf_colorlinks true
 \pdf_backref section
 \pdf_pdfusetitle true
-\papersize a4paper
+\papersize a4
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
@@ -110,7 +113,11 @@ enumitem
 \use_refstyle 0
 \use_minted 0
 \use_lineno 0
-\lineno_options \branch only-as-document-language
+\branch only-as-document-language
+\selected 0
+\filename_suffix 0
+\color #faf0e6
+\end_branch
 \branch babel-only
 \selected 0
 \filename_suffix 0
diff --git a/autotests/export/latex/languages/supported-languages_luatex.lyx b/autotests/export/latex/languages/supported-languages_luatex.lyx
index dab14afd5e..2b0f890944 100644
--- a/autotests/export/latex/languages/supported-languages_luatex.lyx
+++ b/autotests/export/latex/languages/supported-languages_luatex.lyx
@@ -1,12 +1,12 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 575
+\lyxformat 589
 \begin_document
 \begin_header
 \save_transient_properties true
 \origin unavailable
 \textclass scrartcl
 \begin_preamble
-\newfontfamily\amharicfont{NotoSansEthiopic}
+%\newfontfamily\amharicfont{Noto Sans Ethiopic}
 \newfontfamily\churchslavonicfont[Script=Cyrillic]{MonomakhUnicode}
 \newfontfamily\devanagarifont[Script=Devanagari]{Noto Sans Devanagari}
 \newfontfamily\hangulfont[Script=Hangul]{Baekmuk Batang}
@@ -52,7 +52,9 @@ enumitem
 \font_default_family default
 \use_non_tex_fonts true
 \font_sc false
-\font_osf false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \font_cjk gbsn
@@ -77,7 +79,7 @@ enumitem
 \pdf_colorlinks true
 \pdf_backref section
 \pdf_pdfusetitle true
-\papersize a4paper
+\papersize a4
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
@@ -100,7 +102,6 @@ enumitem
 \use_refstyle 0
 \use_minted 0
 \use_lineno 0
-\lineno_options 
 \branch only-as-document-language
 \selected 0
 \filename_suffix 0
@@ -193,7 +194,7 @@ Languages supported by LyX
 \begin_layout Standard
 With language examples that work with 
 \emph on
-Polyglossian
+Polyglossia
 \emph default
  and LuaTeX.
 \end_layout
diff --git a/autotests/export/latex/languages/supported-languages_polyglossia.lyx b/autotests/export/latex/languages/supported-languages_polyglossia.lyx
index 1552baa77b..37a4688b83 100644
--- a/autotests/export/latex/languages/supported-languages_polyglossia.lyx
+++ b/autotests/export/latex/languages/supported-languages_polyglossia.lyx
@@ -6,15 +6,16 @@
 \origin unavailable
 \textclass scrartcl
 \begin_preamble
-\newfontfamily\amharicfont{NotoSansEthiopic}
+\newfontfamily\amharicfont{Noto Sans Ethiopic}
 \newfontfamily\churchslavonicfont[Script=Cyrillic]{MonomakhUnicode}
-\newfontfamily\devanagarifont[Script=Devanagari]{Noto Sans Devanagari}
+\newfontfamily\devanagarifont[Script=Devanagari]{Noto Serif Devanagari}
 \newfontfamily\hangulfont[Script=Hangul]{Baekmuk Batang}
 \newfontfamily\kannadafont[Script=Kannada]{Noto Serif Kannada}
 \newfontfamily\khmerfont[Script=Khmer]{Noto Serif Khmer}
 \newfontfamily\laofont[Script=Lao]{Noto Serif Lao}
 % gloss-marathi.ldf has a spelling error: "script=Devaganari"
-\newfontfamily\marathifont[Script=Devanagari]{Noto Sans Devanagari}
+\newfontfamily\marathifont[Script=Devanagari]{Noto Serif Devanagari}
+% prevent spurious polyglossia error (missing script tag):
 \newfontfamily\syriacfont[Script=Syriac]{FreeSans}
 \newfontfamily\tamilfont[Script=Tamil]{Noto Serif Tamil}
 \newfontfamily\telugufont[Script=Telugu]{Noto Serif Telugu}
@@ -30,7 +31,6 @@
   \setCJKmainfont{IPAexMincho}
   \setCJKsansfont{IPAexGothic}
 \fi
-
 % with LuaTeX, https://www.ctan.org/pkg/luatexja
 % see https://tex.stackexchange.com/questions/222980/how-to-use-chinese-with-lualatex
 \usepackage{ifluatex}
@@ -110,8 +110,11 @@ enumitem
 \use_refstyle 0
 \use_minted 0
 \use_lineno 0
-\lineno_options
 \branch only-as-document-language
+\selected 0
+\filename_suffix 0
+\color #faf0e6
+\end_branch
 \branch babel-only
 \selected 0
 \filename_suffix 0