diff --git a/resave.bat b/resave.bat
index ee8b2e79..dbe37209 100644
--- a/resave.bat
+++ b/resave.bat
@@ -5,6 +5,4 @@ rem l3build save -cconfig-luatex -e\2 \1
 
 REM CHECK  l3build save -cconfig-dvips embedfile
 
-REM check!    - ./build/test/show.luatex.fc
-REM check!  - ./build/test/show.pdftex.fc
 REM leave (id)  - ./build/test/viewerpreferences.xetex.pdf.fc
diff --git a/testfiles/show.luatex.tlg b/testfiles/show.luatex.tlg
index 40002fef..27890bab 100644
--- a/testfiles/show.luatex.tlg
+++ b/testfiles/show.luatex.tlg
@@ -1,34 +1,30 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-The global dictionary 'Core/Catalog' contains the pairs (without outer
+The global dictionary 'g__pdf_Core/Catalog' contains the pairs (without outer
 braces):
 >  {PageMode}  =>  {/UseOutlines}
 >  {OpenAction}  =>  {[5 0 R /Fit]}.
 <recently read> }
-l. ...\pdfdict_show:n{Core/Catalog}
-The global dictionary 'Core/Info' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{g__pdf_Core/Catalog}
+The global dictionary 'g__pdf_Core/Info' contains the pairs (without outer
+braces):
 >  {Creator}  => 
 {<FEFF004C006100540065005800200077006900740068002000680079007000650072007200650
 066>}.
 <recently read> }
-l. ...\pdfdict_show:n{Core/Info}
-The local dictionary 'Core/Catalog' contains the pairs (without outer braces):
->  {abc}  =>  {blub}.
-<recently read> }
-l. ...\pdfdict_show:n{Core/Catalog}
-The global dictionary 'Core/Catalog' contains the pairs (without outer
+l. ...\pdfdict_show:n{g__pdf_Core/Info}
+The local dictionary 'l_Core/Catalog' contains the pairs (without outer
 braces):
->  {PageMode}  =>  {/UseOutlines}
->  {OpenAction}  =>  {[5 0 R /Fit]}.
+>  {abc}  =>  {blub}.
 <recently read> }
-l. ...\pdfdict_show:n{Core/Catalog}
+l. ...\pdfdict_show:n{l_Core/Catalog}
 The Catalog contains in the top level the single value entries
 >  {PageMode}  =>  {/UseOutlines}
 >  {OpenAction}  =>  {[5 0 R /Fit]}
 > \pdfmanagement_show:n {Catalog}.
 <recently read> }
 l. ...\pdfmanagement_show:n{Catalog}
-The dictionary 'blub' is not a declared global or local dictionary.
+The dictionary 'blub' is unknown.
 > .
 <recently read> }
 l. ...\pdfdict_show:n{blub}
diff --git a/testfiles/show.tlg b/testfiles/show.tlg
index 21b623f5..5d6abebe 100644
--- a/testfiles/show.tlg
+++ b/testfiles/show.tlg
@@ -1,33 +1,29 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-The global dictionary 'Core/Catalog' contains the pairs (without outer
+The global dictionary 'g__pdf_Core/Catalog' contains the pairs (without outer
 braces):
 >  {PageMode}  =>  {/UseOutlines}
 >  {OpenAction}  =>  {[5 0 R /Fit]}.
 <recently read> }
-l. ...\pdfdict_show:n{Core/Catalog}
-The global dictionary 'Core/Info' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{g__pdf_Core/Catalog}
+The global dictionary 'g__pdf_Core/Info' contains the pairs (without outer
+braces):
 >  {Creator}  => 
 {<FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>}.
 <recently read> }
-l. ...\pdfdict_show:n{Core/Info}
-The local dictionary 'Core/Catalog' contains the pairs (without outer braces):
->  {abc}  =>  {blub}.
-<recently read> }
-l. ...\pdfdict_show:n{Core/Catalog}
-The global dictionary 'Core/Catalog' contains the pairs (without outer
+l. ...\pdfdict_show:n{g__pdf_Core/Info}
+The local dictionary 'l_Core/Catalog' contains the pairs (without outer
 braces):
->  {PageMode}  =>  {/UseOutlines}
->  {OpenAction}  =>  {[5 0 R /Fit]}.
+>  {abc}  =>  {blub}.
 <recently read> }
-l. ...\pdfdict_show:n{Core/Catalog}
+l. ...\pdfdict_show:n{l_Core/Catalog}
 The Catalog contains in the top level the single value entries
 >  {PageMode}  =>  {/UseOutlines}
 >  {OpenAction}  =>  {[5 0 R /Fit]}
 > \pdfmanagement_show:n {Catalog}.
 <recently read> }
 l. ...\pdfmanagement_show:n{Catalog}
-The dictionary 'blub' is not a declared global or local dictionary.
+The dictionary 'blub' is unknown.
 > .
 <recently read> }
 l. ...\pdfdict_show:n{blub}