diff --git a/base/testfiles-search/tlb-everysel-001.lvt b/base/testfiles-search/tlb-everysel-001.lvt
index ab5ad7f2a..02c0d4a23 100644
--- a/base/testfiles-search/tlb-everysel-001.lvt
+++ b/base/testfiles-search/tlb-everysel-001.lvt
@@ -4,16 +4,18 @@
 
 \usepackage{everysel}
 
-\EverySelectfont{\typeout{Switched to \the\font}}
+\EverySelectfont{\typeout{Font=\the\font}}
 
 \begin{document}
 
 \START
 
-\ttfamily X \itshape Y
+\sffamily  \itshape
 
-\AtNextSelectfont{\typeout{Really!}}
+\AtNextSelectfont{\typeout{One time}}
 
-\sffamily Z \upshape ?
+\ttfamily
+
+\normalfont
 
 \END
diff --git a/base/testfiles-search/tlb-everysel-001.tlg b/base/testfiles-search/tlb-everysel-001.tlg
index 5160de9fa..2a1778a7d 100644
--- a/base/testfiles-search/tlb-everysel-001.tlg
+++ b/base/testfiles-search/tlb-everysel-001.tlg
@@ -1,9 +1,9 @@
 This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
-Switched to \OT1/cmtt/m/n/10 
-Switched to \OT1/cmtt/m/it/10 
+Font=\OT1/cmss/m/n/10 
 LaTeX Font Info:    Font shape `OT1/cmss/m/it' in size <10> not available
 (Font)              Font shape `OT1/cmss/m/sl' tried instead on input line ....
-Switched to \OT1/cmss/m/sl/10 
-Really!
-Switched to \OT1/cmss/m/n/10 
+Font=\OT1/cmss/m/sl/10 
+Font=\OT1/cmtt/m/it/10 
+One time
+Font=\OT1/cmr/m/n/10