diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 4905036fe4..cfe747429f 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -397,26 +397,16 @@ export/doc/ru/(Math|Additional)_(dvi3|pdf[45])_systemF
 # DocBook
 Sublabel: docbook
 # Don't work too hard on obsolete things.
-export/templates/Obsolete/ACM_SIGGGRAPH_0.92_%28obsolete%29_docbook5
-export/templates/Obsolete/ACM_SIGPLAN_%28Obsolete%29_docbook5
-export/templates/Obsolete/ACM_SIG_Proceedings_%28SP,_Obsolete%29_docbook5
-export/templates/Obsolete/American_Geophysical_Union_%28AGUTeX%29_docbook5
-export/templates/Obsolete/American_Psychological_Association_%28APA%29,_v._6_docbook5
+!export/templates/Obsolete/Latex8_Article_%28Obsolete%29_docbook5
+export/templates/Obsolete/.*_docbook5
 # Specific things that are not expected to work.
 # - No real content apart from metadata (forbidden in DocBook).
 export/export/mixing_inTitle_layouts_docbook5
 # - Uses a book class, but has no chapters (forbidden in DocBook).
-export/doc/DummyDocument.*_docbook5
-export/doc/de/DummyDocument.*_docbook5
-export/doc/es/DocumentoPostizo.*_docbook5
-export/doc/fr/DocumentBidon.*_docbook5
-export/doc/ja/DummyDocument.*_docbook5
+export/doc/(|de|es|fr|ja).*(Dummy|Postizo|Bidon).*_docbook5
 export/export/MissingEndLayoutBetweenTables_docbook5
 export/export/latex/languages/ja-listings-uncodable-error_docbook5
 export/export/latex/lyxbugs-resolved/9633-languagenesting_enumerate_and_lyxcode_docbook5
-export/export/latex/lyxbugs-resolved/9633-languagenesting_index_inset_docbook5
-export/export/latex/lyxbugs-resolved/9633-languagenesting1_docbook5
-export/export/latex/lyxbugs-resolved/9633-languagenesting2_docbook5
 export/export/xhtml/MissingEndTagDiv_docbook5
 export/export/xhtml/zh_CN_Tutorial_docbook5
 # - No proper document title (should be fixable).
@@ -425,8 +415,7 @@ export/export/latex/textcyr-textgreek-test_docbook5
 export/export/latex/languages/en-th_utf8_docbook5
 export/export/latex/languages/th-en_utf8_docbook5
 # - Formula in <code> tags.
-export/examples/(de|es|fr|ja|ru)/Graphics_and_Insets/XY-Pic_docbook5
-export/examples/(de|es|fr|ja|ru)/Graphics_and_Insets/XY-Figure_docbook5
+export/examples/(de|es|fr|ja|ru)/Graphics_and_Insets/XY-(Pic|Figure)_docbook5
 export/examples/Graphics_and_Insets/XY-Figure_docbook5
 # - Math macros not implemented.
 export/mathmacros/testcases_speed_docbook5
@@ -458,23 +447,14 @@ export/templates/Letters/KOMA-Script_Letter_%28V._2%29_docbook5
 #   - DIN-Brief: order of paragraphs cannot match valid DocBook.
 export/templates/Letters/DIN-Brief_docbook5
 # - Branches may cause problems (especially when mixing with parts that must go in <info>).
-export/export/latex/languages/supported-languages_docbook5
-export/export/latex/languages/supported-languages_babel_docbook5
-export/export/latex/languages/supported-languages_babel_auto-legacy_docbook5
-export/export/latex/languages/supported-languages_polyglossia_docbook5
+export/export/latex/languages/supported-languages_(|babel|babel_auto-legacy|polyglossia)_?docbook5
 
 Sublabel: docbook poster
 # Posters cannot be properly exported, the LyX documents are too far from
 # DocBook expectations (but should have XML-valid output).
-export/examples/Posters/Beamerposter_docbook5
-export/export/docbook/A0_Poster_Simple_docbook5
-export/export/docbook/SciPoster_docbook5
-export/export/xhtml/A0_Poster_Simple_docbook5
-export/templates/Posters/.*_docbook5
+export/.*Poster.*_docbook5
 
 Sublabel: docbook beamer
 # Beamer is not yet implemented.
-export/examples/(de|es|fr|ja|ru)/Presentations/.*_docbook5
-export/examples/Presentations/.*_docbook5
-export/templates/(de|es|fr|ja|ru)/Presentations/.*_docbook5
-export/templates/Presentations/.*_docbook5
+export/(examples|templates)/(de|es|fr|ja|ru)/Presentations/.*_docbook5
+export/(examples|templates)/Presentations/.*_docbook5