diff --git a/testfiles-fontspec/feat-cvxx-1.tlg b/testfiles-fontspec/feat-cvxx-1.tlg
index 09d307cf..b620d93c 100644
--- a/testfiles-fontspec/feat-cvxx-1.tlg
+++ b/testfiles-fontspec/feat-cvxx-1.tlg
@@ -3,12 +3,12 @@ Don't change this file in any respect.
 TU/EBGaramond-Italic.otf(0)/m/n:
   [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
 TU/EBGaramond-Italic.otf(1)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv05=0; at 10.0pt
 TU/EBGaramond-Italic.otf(2)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv05=0; at 10.0pt
 TU/EBGaramond-Italic.otf(3)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv05=1; at 10.0pt
 TU/EBGaramond-Italic.otf(4)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv05=2; at 10.0pt
 TU/EBGaramond-Italic.otf(5)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv05=3; at 10.0pt
diff --git a/testfiles-fontspec/feat-cvxx-2.tlg b/testfiles-fontspec/feat-cvxx-2.tlg
index c4c929d5..590a0921 100644
--- a/testfiles-fontspec/feat-cvxx-2.tlg
+++ b/testfiles-fontspec/feat-cvxx-2.tlg
@@ -3,8 +3,8 @@ Don't change this file in any respect.
 TU/EBGaramond-Italic.otf(0)/m/n:
   [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
 TU/EBGaramond-Italic.otf(1)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv04=0; at 10.0pt
 TU/EBGaramond-Italic.otf(2)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv05=2; at 10.0pt
 TU/EBGaramond-Italic.otf(3)/m/n:
-  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt; at 10.0pt
+  [EBGaramond-Italic.otf]:mode=node;script=latn;language=dflt;+cv04=0;+cv05=2; at 10.0pt
diff --git a/testfiles-harf/arabic.tlg b/testfiles-harf/arabic.tlg
index 8252fec5..3b958d28 100644
--- a/testfiles-harf/arabic.tlg
+++ b/testfiles-harf/arabic.tlg
@@ -1192,13 +1192,9 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->s*[1.6]"name:Amiri:mode=harf;script=arab;language=dflt;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (fontspec)             - 'bold' (b/n) with NFSS spec.: <->s*[1.6]"name:Amiri/B:mode=harf;script=arab;language=dflt;"
-(fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
 (fontspec)             - 'italic' (m/it) with NFSS spec.: <->s*[1.6]"name:Amiri/I:mode=harf;script=arab;language=dflt;"
-(fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
 (fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->s*[1.6]"name:Amiri/BI:mode=harf;script=arab;language=dflt;"
-(fontspec)             - 'bold italic small caps'  (b/scit) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/Amiri(1)/m/n' will be
 (Font)              scaled to size 16.00006pt on input line ....
 Completed box being shipped out [2]
@@ -2284,7 +2280,6 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->s*[1.2]"[ArefRuqaa-Regular.ttf]:mode=harf;script=arab;language=dflt;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/ArefRuqaa-Regular.ttf(0)/m/n' will be
 (Font)              scaled to size 11.99997pt on input line ....
 Completed box being shipped out [3]
@@ -4537,7 +4532,6 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[NotoNastaliqUrdu-Regular.ttf]:mode=harf;script=arab;language=dflt;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [4]
 \vbox(633.0+0.06)x407.0, direction TLT
 .\glue 16.0
diff --git a/testfiles-harf/color.tlg b/testfiles-harf/color.tlg
index 8a266012..35f32777 100644
--- a/testfiles-harf/color.tlg
+++ b/testfiles-harf/color.tlg
@@ -6,13 +6,9 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"name:Amiri:mode=harf;script=arab;language=dflt;+tlig;color={FF000080};"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (fontspec)             - 'bold' (b/n) with NFSS spec.: <->"name:Amiri/B:mode=harf;script=arab;language=dflt;+tlig;color={FF000080};"
-(fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
 (fontspec)             - 'italic' (m/it) with NFSS spec.: <->"name:Amiri/I:mode=harf;script=arab;language=dflt;+tlig;color={FF000080};"
-(fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
 (fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->"name:Amiri/BI:mode=harf;script=arab;language=dflt;+tlig;color={FF000080};"
-(fontspec)             - 'bold italic small caps'  (b/scit) with NFSS spec.: 
 Inserting `luaotfload.color_handler' in `post_linebreak_filter'.
 Inserting `luaotfload.color_handler' in `hpack_filter'.
 Inserting `luaotfload.color_handler' in `post_mlist_to_hlist_filter'.
diff --git a/testfiles-harf/discretionaries.tlg b/testfiles-harf/discretionaries.tlg
index f2124c5c..b1e5c2a3 100644
--- a/testfiles-harf/discretionaries.tlg
+++ b/testfiles-harf/discretionaries.tlg
@@ -6,27 +6,21 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"kpse:NotoSerifCJK-Regular.ttc:mode=harf;script=latn;language=dflt;-tlig;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (fontspec)             - 'bold' (b/n) with NFSS spec.: <->"kpse:NotoSerifCJK-Regular.ttc:mode=harf;script=latn;language=dflt;-tlig;"
-(fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
 (fontspec)             - 'italic' (m/it) with NFSS spec.: <->"kpse:NotoSerifCJK-Regular.ttc:mode=harf;script=latn;language=dflt;-tlig;"
-(fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
 (fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->"kpse:NotoSerifCJK-Regular.ttc:mode=harf;script=latn;language=dflt;-tlig;"
-(fontspec)             - 'bold italic small caps'  (b/scit) with NFSS spec.: 
 Package fontspec Info: 
 (fontspec)             Font family 'lmroman10-regular.otf(0)' created for font 'lmroman10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,KpseOnly].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"kpse:lmroman10-regular.otf:mode=harf;script=latn;language=dflt;+dlig;+tlig;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Package fontspec Info: 
 (fontspec)             Font family 'lmroman10-regular.otf(1)' created for font 'lmroman10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,KpseOnly,Ligatures=TeXOff].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"kpse:lmroman10-regular.otf:mode=harf;script=latn;language=dflt;+dlig;-tlig;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT
 .\glue 16.0
diff --git a/testfiles-harf/scripts.tlg b/testfiles-harf/scripts.tlg
index fc47d901..342fd537 100644
--- a/testfiles-harf/scripts.tlg
+++ b/testfiles-harf/scripts.tlg
@@ -1,14 +1,13 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-Package fontspec Warning: 
-(fontspec)                Script 'Greek' not explicitly supported within font 'amiri-regular'. Check the typeset output, and if it is okay then ignore this warning. Otherwise a different font should be chosen.
+Package fontspec Info: 
+(fontspec)             Script 'Greek' not explicitly supported within font 'amiri-regular'. Check the typeset output, and if it is okay then ignore this warning. Otherwise a different font should be chosen.
 Package fontspec Info: 
 (fontspec)             Font family 'amiri-regular.ttf(1)' created for font 'amiri-regular.ttf' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Script=Greek].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=grek;language=dflt;+tlig;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Warning: Font shape `TU/amiri-regular.ttf(0)/m/it' undefined
 (Font)              using `TU/amiri-regular.ttf(0)/m/n' instead on input line ....
 Package fontspec Info: 
@@ -17,28 +16,24 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=ARA;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Package fontspec Info: 
 (fontspec)             Font family 'amiri-regular.ttf(3)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Urdu].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=URD;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Package fontspec Info: 
 (fontspec)             Font family 'amiri-regular.ttf(4)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Sindhi].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=SND;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Package fontspec Info: 
 (fontspec)             Font family 'amiri-regular.ttf(5)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Kashmiri].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=KSH;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.03)x407.0, direction TLT
 .\glue 16.0
diff --git a/testfiles-harf/story.tlg b/testfiles-harf/story.tlg
index 9ef69126..913a653c 100644
--- a/testfiles-harf/story.tlg
+++ b/testfiles-harf/story.tlg
@@ -6,14 +6,12 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[lmroman10-bold.otf]:mode=harf;script=latn;language=dflt;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Package fontspec Info: 
 (fontspec)             Font family 'lmromanslant10-regular.otf(0)' created for font 'lmromanslant10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[lmromanslant10-regular.otf]:mode=harf;script=latn;language=dflt;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Package fontspec Info: 
 (fontspec)             lmroman12-regular scale = 1.2.
 Package fontspec Info: 
@@ -24,7 +22,6 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->s*[1.2]"[lmroman12-regular.otf]:mode=harf;script=latn;language=dflt;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 ! Undefined control sequence.
 l. ...\testr
 The control sequence at the end of the top line
@@ -398,7 +395,6 @@ Package fontspec Info:
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[lmroman10-regular.otf]:mode=harf;script=latn;language=dflt;+tlig;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (../story.tex
 LaTeX Font Warning: Font shape `TU/lmroman10-regular.otf(0)/b/n' undefined
 (Font)              using `TU/lmroman10-regular.otf(0)/m/n' instead on input line ....
diff --git a/testfiles-latex-TU/tu-composites01.tlg b/testfiles-latex-TU/tu-composites01.tlg
index 0c2ce30a..e0da992a 100644
--- a/testfiles-latex-TU/tu-composites01.tlg
+++ b/testfiles-latex-TU/tu-composites01.tlg
@@ -383,6 +383,6 @@ Missing character: There is no ̨ (U+0328) in font [lmroman10-regular]:+tlig;!
 Missing character: There is no ̨ (U+0328) in font [lmroman10-regular]:+tlig;!
 ] (tu-composites01.aux)
  ***********
-LaTeX2e <2023-11-01> patch level 1
-L3 programming layer <2024-04-11>
+LaTeX2e <2024-06-01> patch level 2
+L3 programming layer <2024-05-27>
  ***********
diff --git a/testfiles-latex-TU/tu-composites02.tlg b/testfiles-latex-TU/tu-composites02.tlg
index 058542e8..e6f50c11 100644
--- a/testfiles-latex-TU/tu-composites02.tlg
+++ b/testfiles-latex-TU/tu-composites02.tlg
@@ -200,6 +200,6 @@ l. ...\test{y}
 l. ...\test{z}
 (tu-composites02.aux)
  ***********
-LaTeX2e <2023-11-01> patch level 1
-L3 programming layer <2024-04-11>
+LaTeX2e <2024-06-01> patch level 2
+L3 programming layer <2024-05-27>
  ***********
diff --git a/testfiles-latex-TU/tu-tl2e7.tlg b/testfiles-latex-TU/tu-tl2e7.tlg
index d8df6043..db5e2d1e 100644
--- a/testfiles-latex-TU/tu-tl2e7.tlg
+++ b/testfiles-latex-TU/tu-tl2e7.tlg
@@ -1387,6 +1387,6 @@ Completed box being shipped out [2]
 Missing character: There is no ̧ (U+0327) in font [lmroman10-regular]:+tlig;!
 (tu-tl2e7.aux)
  ***********
-LaTeX2e <2023-11-01> patch level 1
-L3 programming layer <2024-04-11>
+LaTeX2e <2024-06-01> patch level 2
+L3 programming layer <2024-05-27>
  ***********
diff --git a/testfiles/add-uppercase-feature.tlg b/testfiles/add-uppercase-feature.tlg
index eb79b47e..99b9b9ca 100644
--- a/testfiles/add-uppercase-feature.tlg
+++ b/testfiles/add-uppercase-feature.tlg
@@ -1,13 +1,17 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 luaotfload | aux : font no 19 (nil) does not define feature smcp for script latn with language dflt
+luaotfload | aux : font no 19 (nil) does not define feature smcp for script latn with language dflt
+luaotfload | aux : font no 19 (nil) does not define feature smcp for script dflt with language dflt
+luaotfload | aux : font no 19 (nil) does not define feature smcp for script latn with language dflt
+luaotfload | aux : font no 19 (nil) does not define feature smcp for script latn with language dflt
+luaotfload | aux : font no 19 (nil) does not define feature smcp for script dflt with language dflt
 Package fontspec Info: 
 (fontspec)             Font family 'DejaVuSans.ttf(1)' created for font 'DejaVuSans.ttf' with options [Ligatures=TeX,RawFeature=+vircase].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[DejaVuSans.ttf]:mode=node;script=latn;language=dflt;+tlig;+vircase;"
-(fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT
 .\glue 16.0
diff --git a/testfiles/patch-safe-unsafe.tlg b/testfiles/patch-safe-unsafe.tlg
index 795aed24..a04e1630 100644
--- a/testfiles/patch-safe-unsafe.tlg
+++ b/testfiles/patch-safe-unsafe.tlg
@@ -2,5 +2,6 @@ This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 patch_fontname:texgyreheros2
 patch_font_unsafecmr100
-patch_font_unsafe, no table! [1
+patch_font_unsafe, no table!
+[1
 ] (patch-safe-unsafe.aux)
diff --git a/testfiles/testtexmf.tlg b/testfiles/testtexmf.tlg
index c0b10253..84e3ad85 100644
--- a/testfiles/testtexmf.tlg
+++ b/testfiles/testtexmf.tlg
@@ -1,6 +1,7 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-(../../supporttexmf/tex/latex/testluaotfloadtexmfinput.tex) [1
+(../../supporttexmf/tex/latex/testluaotfloadtexmfinput.tex)
+[1
 Missing character: There is no a (U+0061) in font file:LuaotfloadDummyFont.otf:mode=node!
 Missing character: There is no b (U+0062) in font file:LuaotfloadDummyFont.otf:mode=node!
 Missing character: There is no c (U+0063) in font file:LuaotfloadDummyFont.otf:mode=node!