diff --git a/development/autotests/nonstandardTests b/development/autotests/nonstandardTests
index 91e12c1bd9..92debac4fd 100644
--- a/development/autotests/nonstandardTests
+++ b/development/autotests/nonstandardTests
@@ -3,6 +3,8 @@ export/templates/IUCr-article_(dvi|pdf).*
 export/templates/es_beamer-conference-ornate-20min_pdf4_texF
 export/templates/kluwer_pdf5_systemF
 export/templates/kluwer_pdf[45]_systemF
+export/examples/modernCV_pdf4_(tex|system)F
+export/templates/ectaart_(dvi3|pdf5)_(tex|system)F
 #
 export/examples/(|fr/)seminar_(dvi|pdf|pdf[23]|pdf4_texF|pdf5_systemF)
 #
@@ -10,3 +12,4 @@ export/examples/(|fr/)seminar_(dvi|pdf|pdf[23]|pdf4_texF|pdf5_systemF)
 # 2.) LuaTeX does not support Farsi yet. See:
 #     https://github.com/reutenauer/polyglossia/commit/ccb0e9e2c6411170ad779b05ff5076f1193cc323
 export/examples/fa/splash_(dvi|pdf|pdf[23]|(dvi3|pdf4|pdf5)_(texF|systemF))
+#
diff --git a/development/autotests/revertedTests b/development/autotests/revertedTests
index 2033ad9902..2438aca7fd 100644
--- a/development/autotests/revertedTests
+++ b/development/autotests/revertedTests
@@ -161,8 +161,6 @@ export/examples/(ru|uk)/splash_(dvi3|pdf[45])_texF
 # This is wrong for Xe/Lua with 8-bit TeX-fonts.
 # (It can be overridden adding the "strings=generic" option to Babel.)
 # for now inverted
-export/doc/es/.*_(dvi3|pdf[45])_texF
-export/.*/es/.*_(dvi3|pdf5)_texF
 export/examples/es/linguistics_pdf4_texF
 export/examples/linguistics_(dvi3|pdf[45])_systemF
 #
@@ -172,7 +170,6 @@ export/examples/linguistics_(dvi3|pdf[45])_systemF
 # don't know where it comes from. On first inspection, the output looks OK.
 # Explore later.
 export/examples/(|es/)(europe|modern)CV_(dvi3|pdf5)_(texF|systemF)
-export/examples/modernCV_pdf4_(texF|systemF)
 #
 # GM: * lmodern.sty
 #     * missing commands and missing characters
@@ -207,7 +204,7 @@ export/examples/achemso_(dvi3|pdf5)_texF
 # Export to certain formats cannot be excluded from a module currently,
 # but even if they don't report an error, other formats result in corrupt
 # output documents (missing landscape slides).
-export/examples/(|fr/)seminar_pdf(2|4_systemF|5.*F)
+export/examples/(|fr/)seminar_pdf(2|[45]_systemF)
 #
 # GM: Korean? I don't expect this to work with Xe/Lua and TeXfonts.
 export/examples/ko/splash_(dvi3|pdf[45])_texF