diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index 02e13ed12f..05c86f8509 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -78,8 +78,9 @@ export/.*/zh_CN/.*texF
 export/examples/ja/Modules/Rnw.*knitr.*
 !export/examples/ja/Modules/Sweave.*_(lyx.*|xhtml|pdf4_systemF)
 export/examples/ja/Modules/Sweave.*
-# examples/multilingual.lyx uses "Japanese (CJK)"
-!export/examples/ja/Multilingual_Typesetting_.*
+# example for "Japanese (CJK)"
+!export/examples/ja/Multilingual_Typesetting_.*CJKutf8.*
+#
 export/.*/ja/.*_(pdf[245]|dvi3).*
 # the unicodesymbols-tests use pdflatex, too:
 export/export/latex/unicodesymbols/.*-platex_pdf2
diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 78d6e7dbf8..a674e0d6a2 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -230,7 +230,7 @@ export/examples/Modules/Hazard_and_Precautionary_Statements_.*_systemF
 # LyX-generated preamble, but it seems it's better to wait until the packages
 # fix the root issue themselves.
 # xy package:
-.*(|fr/)xy(pic|figure).*pdf5.*
+export/examples/(|fr/)XY-(Pic|Figure)_pdf5.*
 
 # Problem with Check and Slovak Babel support.
 # (reported per mail to Petr Tesa\v{r}\'ik, 2016-09-06)
diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests
index eaee41ddd0..33c2270f1e 100644
--- a/development/autotests/unreliableTests
+++ b/development/autotests/unreliableTests
@@ -16,8 +16,8 @@ Sublabel: nonstandard
 # TODO: rename to "extra" or "exotic"?
 
 # aa.cls (not in TeXLive).
-eport/examples/Articles/Astronomy_&_Astrophysics.*
-eport/templates/Articles/Astronomy_&_Astrophysics.*
+export/examples/Articles/Astronomy_%26_Astrophysics.*
+export/templates/Articles/Astronomy_%26_Astrophysics.*
 
 # AEA.cls (see https://wiki.lyx.org/Examples/AEA)
 export/templates/Articles/American_Economic_Association_(AEA).*
@@ -73,9 +73,9 @@ export/templates/Obsolete/.*
 export/templates/Articles/Springers_Global_Journal_Template.*
 
 # svmono.cls
-export/examples/Books/Springer_Monographs.*
+templates/examples/Books/Springer_Monographs.*
 # svmult.cls
-export/examples/springer/Books/Springer_Contributed_Books.*
+templates/examples/Books/Springer_Contributed_Books.*
 
 
 Sublabel: needauth
@@ -119,7 +119,7 @@ export/export/latex/luainputenc-utf8_pdf5_texF
 
 # aastex: hard-coded version in class name:
 # 2018-05-12 aastex6.cls -> aastex62.cls
-lib/examples/Articles/American_Astronomical_Society_.*
+export/examples/Articles/American_Astronomical_Society_.*
 export/templates/Articles/American_Astronomical_Society_.*
 
 # `acmart` calls "libertine" as default font.
diff --git a/lib/examples/Articles/American_Chemical_Society_%28ACS%29.lyx b/lib/examples/Articles/American_Chemical_Society_%28ACS%29.lyx
index 41ee5e1ef3..dff76991cd 100644
--- a/lib/examples/Articles/American_Chemical_Society_%28ACS%29.lyx
+++ b/lib/examples/Articles/American_Chemical_Society_%28ACS%29.lyx
@@ -584,7 +584,7 @@ This box and the associated title will always be printed on a separate page
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "biblioExample"
+bibfiles "../biblioExample"
 
 \end_inset
 
diff --git a/lib/examples/Articles/Astronomy_%26_Astrophysics.lyx b/lib/examples/Articles/Astronomy_%26_Astrophysics.lyx
index 1dec42cf93..6916878897 100644
--- a/lib/examples/Articles/Astronomy_%26_Astrophysics.lyx
+++ b/lib/examples/Articles/Astronomy_%26_Astrophysics.lyx
@@ -1228,7 +1228,7 @@ schaft, DFG
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
 btprint "btPrintAll"
-bibfiles "biblioExample"
+bibfiles "../biblioExample"
 options "aa"
 
 \end_inset
diff --git a/lib/examples/Books/Tufte_Book.lyx b/lib/examples/Books/Tufte_Book.lyx
index 52e4dfa686..dba2d5a1b6 100644
--- a/lib/examples/Books/Tufte_Book.lyx
+++ b/lib/examples/Books/Tufte_Book.lyx
@@ -1510,7 +1510,7 @@ p114: 1, 4, 5, 6, 8, 10, 12, 15
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "biblioExample"
+bibfiles "../biblioExample"
 options "plainnat"
 
 \end_inset
diff --git a/lib/examples/Handouts/Tufte_Handout.lyx b/lib/examples/Handouts/Tufte_Handout.lyx
index ac2973ffca..f5a21784a9 100644
--- a/lib/examples/Handouts/Tufte_Handout.lyx
+++ b/lib/examples/Handouts/Tufte_Handout.lyx
@@ -1529,7 +1529,7 @@ svn
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "biblioExample"
+bibfiles "../biblioExample"
 options "plainnat"
 
 \end_inset
diff --git a/lib/examples/de/Handouts/Tufte_Handout.lyx b/lib/examples/de/Handouts/Tufte_Handout.lyx
index 3b15ce90c9..2abaf55256 100644
--- a/lib/examples/de/Handouts/Tufte_Handout.lyx
+++ b/lib/examples/de/Handouts/Tufte_Handout.lyx
@@ -1563,7 +1563,7 @@ svn
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "../biblioExample"
+bibfiles "../../biblioExample"
 options "plainnat"
 
 \end_inset
diff --git a/lib/examples/de/Letters/Serial_Letter_1.lyx b/lib/examples/de/Letters/Serial_Letter_1.lyx
index 41255b86da..a0d4ec271f 100644
--- a/lib/examples/de/Letters/Serial_Letter_1.lyx
+++ b/lib/examples/de/Letters/Serial_Letter_1.lyx
@@ -426,7 +426,7 @@ renewcommand*
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand input
-filename "../addressExample.adr"
+filename "../../Letters/addressExample.adr"
 
 \end_inset
 
diff --git a/lib/examples/de/Letters/Serial_Letter_2.lyx b/lib/examples/de/Letters/Serial_Letter_2.lyx
index ec11fe049b..f213f33e09 100644
--- a/lib/examples/de/Letters/Serial_Letter_2.lyx
+++ b/lib/examples/de/Letters/Serial_Letter_2.lyx
@@ -219,7 +219,7 @@ today
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand input
-filename "../addressExample.adr"
+filename "../../Letters/addressExample.adr"
 
 \end_inset
 
diff --git a/lib/examples/de/Letters/Serial_Letter_3.lyx b/lib/examples/de/Letters/Serial_Letter_3.lyx
index 3be9eab9fe..6c5f341c67 100644
--- a/lib/examples/de/Letters/Serial_Letter_3.lyx
+++ b/lib/examples/de/Letters/Serial_Letter_3.lyx
@@ -460,7 +460,7 @@ renewcommand*
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand input
-filename "../addressExample.adr"
+filename "../../Letters/addressExample.adr"
 
 \end_inset
 
diff --git a/lib/examples/de/Presentations/Beamer.lyx b/lib/examples/de/Presentations/Beamer.lyx
index be46590e71..f7b6600ddb 100644
--- a/lib/examples/de/Presentations/Beamer.lyx
+++ b/lib/examples/de/Presentations/Beamer.lyx
@@ -107,7 +107,7 @@ Version
 
 \begin_layout TitleGraphic
 \begin_inset Graphics
-	filename ../../doc/clipart/3D-structure-distort.pdf
+	filename ../../../doc/clipart/3D-structure-distort.pdf
 	lyxscale 30
 	scale 10
 
diff --git a/lib/examples/de/Presentations/Beamer_Article_%28Standard_Class%29.lyx b/lib/examples/de/Presentations/Beamer_Article_%28Standard_Class%29.lyx
index d1c2481744..239330e582 100644
--- a/lib/examples/de/Presentations/Beamer_Article_%28Standard_Class%29.lyx
+++ b/lib/examples/de/Presentations/Beamer_Article_%28Standard_Class%29.lyx
@@ -147,7 +147,7 @@ Diese Warnung nicht mehr anzeigen!
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
-filename "/usr/local/share/lyx/examples/de/Beamer.lyx"
+filename "Beamer.lyx"
 
 \end_inset
 
diff --git a/lib/examples/es/Books/Tufte_Book.lyx b/lib/examples/es/Books/Tufte_Book.lyx
index a53a7d23cd..61a51bca0a 100644
--- a/lib/examples/es/Books/Tufte_Book.lyx
+++ b/lib/examples/es/Books/Tufte_Book.lyx
@@ -1549,7 +1549,7 @@ p114: 1, 4, 5, 6, 8, 10, 12, 15
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "../biblioExample"
+bibfiles "../../biblioExample"
 options "plainnat"
 
 \end_inset
diff --git a/lib/examples/es/Curricula_Vitae/Europe_CV.lyx b/lib/examples/es/Curricula_Vitae/Europe_CV.lyx
index ca2bb65c4a..054760c3ca 100644
--- a/lib/examples/es/Curricula_Vitae/Europe_CV.lyx
+++ b/lib/examples/es/Curricula_Vitae/Europe_CV.lyx
@@ -274,7 +274,7 @@ height=3cm
 
 \end_inset
 
-../CV-image
+../../Curricula_Vitae/CV-image
 \begin_inset Note Note
 status open
 
diff --git a/lib/examples/es/Curricula_Vitae/Modern_CV.lyx b/lib/examples/es/Curricula_Vitae/Modern_CV.lyx
index 52efdb22cd..17e5f4769c 100644
--- a/lib/examples/es/Curricula_Vitae/Modern_CV.lyx
+++ b/lib/examples/es/Curricula_Vitae/Modern_CV.lyx
@@ -501,7 +501,7 @@ status collapsed
 
 \end_inset
 
-../CV-image
+../../Curricula_Vitae/CV-image
 \begin_inset Note Note
 status open
 
diff --git a/lib/examples/es/Handouts/Tufte_Handout.lyx b/lib/examples/es/Handouts/Tufte_Handout.lyx
index 76bf658d21..feb5cd6005 100644
--- a/lib/examples/es/Handouts/Tufte_Handout.lyx
+++ b/lib/examples/es/Handouts/Tufte_Handout.lyx
@@ -1664,7 +1664,7 @@ n.
 \begin_layout Standard
 \begin_inset CommandInset bibtex
 LatexCommand bibtex
-bibfiles "../biblioExample"
+bibfiles "../../biblioExample"
 options "plainnat"
 
 \end_inset
diff --git a/lib/examples/fr/Presentations/Beamer.lyx b/lib/examples/fr/Presentations/Beamer.lyx
index dd26bf8953..a73d849b68 100644
--- a/lib/examples/fr/Presentations/Beamer.lyx
+++ b/lib/examples/fr/Presentations/Beamer.lyx
@@ -135,7 +135,7 @@ Version
 
 \begin_layout TitleGraphic
 \begin_inset Graphics
-	filename ../../doc/clipart/3D-structure-distort.pdf
+	filename ../../../doc/clipart/3D-structure-distort.pdf
 	lyxscale 30
 	scale 10
 
diff --git a/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx b/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
index fc9bf8e1ae..81a2e59522 100644
--- a/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
+++ b/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
@@ -3,7 +3,7 @@
 \begin_document
 \begin_header
 \save_transient_properties true
-\origin /buildlyxdir/examples/ja/
+\origin /systemlyxdir/examples/ja/
 \textclass jarticle
 \use_default_options false
 \maintain_unincluded_children false
@@ -150,7 +150,9 @@ Swedish: Hej då.
 \end_layout
 
 \begin_layout Standard
-Compilation error with inputenc 
+
+\emph on
+Missing characters with inputenc 
 \begin_inset Quotes eld
 \end_inset
 
@@ -158,7 +160,21 @@ auto
 \begin_inset Quotes erd
 \end_inset
 
- (language default): 
+ 
+\emph default
+(language default) 
+\emph on
+and 
+\begin_inset Quotes eld
+\end_inset
+
+utf8-platex
+\begin_inset Quotes erd
+\end_inset
+
+
+\emph default
+: 
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/examples/ja/Presentations/Beamer.lyx b/lib/examples/ja/Presentations/Beamer.lyx
index 5ad7b52c1a..711c0ae274 100644
--- a/lib/examples/ja/Presentations/Beamer.lyx
+++ b/lib/examples/ja/Presentations/Beamer.lyx
@@ -110,7 +110,7 @@ Beamerと\SpecialChar LyX
 
 \begin_layout TitleGraphic
 \begin_inset Graphics
-	filename ../../doc/clipart/3D-structure-distort.pdf
+	filename ../../../doc/clipart/3D-structure-distort.pdf
 	lyxscale 30
 	scale 10