diff --git a/autotests/export/latex/languages/supported-languages.lyx b/autotests/export/latex/languages/supported-languages.lyx
index d2ba3adcad..4155ab1aaa 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -5,6 +5,15 @@
 \save_transient_properties true
 \origin unavailable
 \textclass scrartcl
+\begin_preamble
+% If fontspec (Polyglossia + XeTeX/LuaTeX) is used, 
+% we need a proper Arabic font
+\AtBeginDocument{%
+   \@ifpackageloaded{fontspec}{%
+     \newfontfamily\arabicfont[Script=Arabic]{Amiri}%
+  }{}%
+}
+\end_preamble
 \use_default_options false
 \begin_modules
 enumitem
diff --git a/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx b/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
index fa58588ebc..53e07ade74 100644
--- a/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
+++ b/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
@@ -6,6 +6,7 @@
 \origin unavailable
 \textclass scrartcl
 \begin_preamble
+\newfontfamily\arabicfont[Script=Arabic]{Amiri}
 \newfontfamily\amharicfont{Noto Sans Ethiopic}
 \newfontfamily\churchslavonicfont{Monomakh Unicode}
 \newfontfamily\devanagarifont{Noto Serif Devanagari}