diff --git a/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx b/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
index 719d8a6396..83b40e64db 100644
--- a/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
+++ b/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
@@ -23,8 +23,8 @@
 \newfontfamily\thaanafont{FreeSerif} % prevent "missing script tag" error
 %\newfontfamily\thaanafont{Noto Sans Thaana} % works, too
 \newfontfamily\tibetanfont{Noto Serif Tibetan}
-\newfontfamily\CJKfont{IPAexMincho}
-\newfontfamily\CJKfontsf{IPAexGothic}
+\newfontfamily\chinesefont[script=CJK]{IPAexMincho}
+\newfontfamily\chinesefontsf[script=CJK]{IPAexGothic}
 \newfontfamily\japanesefont[script=CJK]{IPAexMincho}
 \end_preamble
 \use_default_options false
diff --git a/autotests/export/latex/languages/supported-languages_polyglossia.lyx b/autotests/export/latex/languages/supported-languages_polyglossia.lyx
index f0448581b8..917263a6a0 100644
--- a/autotests/export/latex/languages/supported-languages_polyglossia.lyx
+++ b/autotests/export/latex/languages/supported-languages_polyglossia.lyx
@@ -24,8 +24,8 @@
 \newfontfamily\thaanafont{FreeSerif}  % missing script tag in FreeSerif
 %\newfontfamily\thaanafont{Noto Sans Thaana} % works, too
 \newfontfamily\tibetanfont{Noto Sans Tibetan}
-\newfontfamily\CJKfont{IPAexMincho}
-\newfontfamily\CJKfontsf{IPAexGothic}
+\newfontfamily\chinesefont[script=CJK]{IPAexMincho}
+\newfontfamily\chinesefontsf[script=CJK]{IPAexGothic}
 \newfontfamily\japanesefont[script=CJK]{IPAexMincho}
 
 % Needed for churchslavonic which is an extra package