diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index 269270d82a..943bc350d3 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -31,6 +31,8 @@ Sublabel: special
 # Documents that do not work with all exports
 # ===========================================
 
+# Only PDFLaTeX
+###############
 # Inside these two files, we state that they should only be expected
 # to work with pdflatex and possibly lualatex.
 export/examples/Modules/PDF_Form_(dvi.*|pdf[^25]*)
@@ -41,12 +43,16 @@ export/examples/(|de/|fr/)Modules/PDF_Comments_pdf5_texF
 # "All documents need to be processed by pdflatex" [jss.pdf]
 export/templates/Articles/Journal_of_Statistical_Software_.*(dvi|dvi3_.*|pdf3?)
 
-# Beamer does not work with divpdf[m] (wrong output or compilation errors).
+# No dvipdf[m]
+##############
+# Beamer does not work with dvipdf[m] (wrong output or compilation errors).
 # See `texdoc beamer`.
 # TODO: Should the export do PDF (dvipdfm) be made unavailable for Beamer or
 # just a warning be given in the example or documentation?
 export/.*/(|de/|es/|fr/|ja/).*Beamer.*pdf3
 
+# Only Postscript (and ps2pdf)
+#################
 # Document uses Postscript specials
 # Does not compile with pdflatex or non-TeX fonts (see note in the document source).
 export/examples/Graphics_and_Insets/Instant_Preview_pdf[25].*
@@ -56,11 +62,14 @@ export/examples/Articles/Chess/Game_2_pdf[25].*
 export/examples/(|fr/)Presentations/Powerdot_pdf[25].*
 export/examples/Modules/Chessboard_(lyx(16|20|21|22|23)|(pdf3|pdf5|dvi3)_texF)
 
+# XeTeX with TeX fonts
+######################
 # XeTeX with TeX-fonts works only for input encodings "utf8" and "ascii".
 # Generally, documentation and templates use "auto" 8-bit encodings.
 # 1. Exceptions to the following pattern (test cases with the right encoding):
-!export/examples/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ja|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|ru|sk|sl|sr|sv|uk|zh_CN)/Welcome_pdf4_texF
-!export/examples/ja/Multilingual_Typesetting_.*CJK.*_pdf4_texF
+!export/examples/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|ru|sk|sl|sr|sv|uk|zh_CN)/Welcome_pdf4_texF
+# encoding right but packages clash:
+#!export/examples/ja/Multilingual_Typesetting_.*CJK.*_pdf4_texF
 # 2. Catchall patterns to ignore the other tests:
 .*_pdf4_texF
 export/(doc|examples|templates)/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ja|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|ru|sk|sl|sr|sv|uk|zh_CN)/.*pdf4_texF
@@ -71,26 +80,32 @@ export/.*/ko/.(dvi3|pdf5)_texF
 export/.*/zh_CN/.(dvi3|pdf5)_texF
 export/export/latex/CJK/zh_CN-toc_.(dvi3|pdf5)_texF
 
+# pLaTeX
+########
+# ignore with pdflatex and Xe/LuaTeX with 8-bit fonts:
+#
+export/export/latex/.*platex.*(pdf2|texF)
+export/export/latex/ja_wrong_auto_encoding_(pdf2|texF)
+#
+# Most Japanese documents use language "japanese" wich is tied to "platex"
+# (automatically invoked instead of "latex" to create a DVI file).
+# For a discussion of alternatives for Japanese with LaTeX , see also
+# https://tex.stackexchange.com/questions/320021/xelatex-using-japanese-ldf-for-babel-causes-invalid-characters-errors
+#
+# Exceptions: 
+# The "!" means: "Protect these tests from being matched by future patterns in this file".
+# Export by plain- and pdflatex engines works with language "japanese-cjk", e.g.
+!export/examples/ja/Multilingual_Typesetting_.*CJK.*(dvi|pdf[23]?)
+!export/examples/ja/Multilingual_Typesetting_.*CJK.*systemF
+# the rest:
+export/.*/ja/.*_(pdf2|texF)
+
 # Japanese knitr.lyx and sweave.lyx support only XeLaTeX with system fonts
-# because they use the "bxjsarticle" class.
-# The "!" means the following:
-#   "Protect these tests from being matched by future patterns in this file".
+# because they use the "bxjsarticle" class and non-TeX fonts
 !export/examples/ja/Modules/Rnw.*knitr.*_(lyx.*|xhtml|pdf4_systemF)
 export/examples/ja/Modules/Rnw.*knitr.*
 !export/examples/ja/Modules/Sweave.*_(lyx.*|xhtml|pdf4_systemF)
 export/examples/ja/Modules/Sweave.*
-#
-# Other Japanese documents use language "japanese" wich is tied to "platex"
-# (automatically invoked instead of "latex" to create a DVI file).
-# Export by plain- and pdflatex engines works with language "japanese-cjk", e.g.
-!export/examples/ja/Multilingual_Typesetting_.*CJK.*(dvi|pdf[23]?)
-!export/examples/ja/Multilingual_Typesetting_.*CJK.*systemF
-# For a discussion of alternatives for Japanese with LaTeX , see also
-# http://www.preining.info/blog/2014/12/writing-japanese-in-latex-part-1-introduction/
-export/.*/ja/.*_(pdf2|texF)
-# ignore tests for pLaTeX with pdflatex or Xe/LuaTeX and 8-bit fonts:
-export/export/latex/.*platex.*(pdf2|texF)
-export/export/latex/ja_wrong_auto_encoding_(pdf2|texF)
 
 
 # export of minted documents to 2.2.x is not guaranteed to work (and currently
diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 91f8afc0e2..ba271ce4e6 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -96,6 +96,10 @@ export/export/latex/supported-languages_pdf3
 # (see thaifont.txt in the CJK documentation for setup details).
 export/export/latex/unicodesymbols/031-thai_th_(euc-|gbk|jis|utf8-cjk).*
 
+# Package clashes when Japanese documents are compiled with non-TeX fonts,
+# e.g. the auto-loaded jsclasses/okumacro.sty needs format `pLaTeX2e'
+export/doc/ja/(Additional|Customization|EmbeddedObjects|Formula-numbering|Intro|LaTeXConfig|Math|Shortcuts|Tutorial|UserGuide).*_systemF
+
 
 # ================================================
 Sublabel: lyxbugs
@@ -161,11 +165,8 @@ export/export/latex/fa-OT1_pdf2
 #11522 Support specification of complementing non-TeX fonts
 # More than one non-TeX font required for the character set in many documents
 # to prevent "missing glyph" errors with non-TeX fonts
-# FIXME: fix and uninvert documents that work after setting a Japanese system font.
-export/export/latex/.*inputenc-.*_systemF
-!export/examples/ja/Multilingual_Typesetting_%28CJKutf8%29_.*_systemF
-export/.*/ja/.*_systemF
 #
+export/export/latex/.*inputenc-.*_systemF
 export/doc/(|de/|es/|fr/)Math.*systemF
 # minimal example for Math.lyx:
 export/export/latex/systemfonts-Math-missingchars.*systemF