diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/BasicUtils.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/BasicUtils.kt
index 12e7444a7..4ddee2018 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/BasicUtils.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/BasicUtils.kt
@@ -140,7 +140,7 @@ fun Component.matches(spec: SearchSpec<Component>.() -> Unit): Boolean =
  */
 fun <T> T._focus() where T : Focusable<*>, T : Component {
     checkEditableByUser()
-    _fireEvent(FocusNotifier.FocusEvent<T>(this, true))
+    _fireEvent(FocusNotifier.FocusEvent<T>(this, true, null))
 }
 
 /**
@@ -148,7 +148,7 @@ fun <T> T._focus() where T : Focusable<*>, T : Component {
  */
 fun <T> T._blur() where T : Focusable<*>, T : Component {
     checkEditableByUser()
-    _fireEvent(BlurNotifier.BlurEvent<T>(this, true))
+    _fireEvent(BlurNotifier.BlurEvent<T>(this, true, null))
 }
 
 /**
diff --git a/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIteratorTest.kt b/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIteratorTest.kt
index 6cb805574..e27e6d244 100644
--- a/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIteratorTest.kt
+++ b/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIteratorTest.kt
@@ -17,6 +17,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout
 import com.vaadin.flow.component.orderedlayout.VerticalLayout
 import com.github.mvysny.dynatest.DynaNodeGroup
 import com.github.mvysny.dynatest.expectList
+import com.vaadin.flow.component.Text
 
 fun DynaNodeGroup.depthFirstTreeIteratorTests() {
     test("DepthFirstTreeIterator") {
@@ -28,7 +29,13 @@ fun DynaNodeGroup.depthFirstTreeIteratorTests() {
         val expected = mutableListOf<Component>()
         val root = VerticalLayout().apply {
             expected.add(this)
-            add(Button("Foo").apply { expected.add(this) })
+            add(Button("Foo").apply {
+                expected.add(this)
+                // In Vaadin 25.1, Button also has a text node
+                this.children.filter { it is Text }
+                    .findFirst()
+                    .ifPresent { expected.add(it) }
+            })
             add(HorizontalLayout().apply {
                 expected.add(this)
                 add(Span().apply { expected.add(this) })
diff --git a/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt b/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt
index 185092ee5..a27fb65e1 100644
--- a/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt
+++ b/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt
@@ -199,7 +199,10 @@ internal fun DynaNodeGroup.locatorTest() {
         _get<Button> { caption = "Click Me" }.click()
         expectAfterLookupCalled()
 
-        expect("Thanks Baron Vladimir Harkonnen, it works!") { _get<Text>().text }
+        expect("Thanks Baron Vladimir Harkonnen, it works!") { _get<Text>{
+            // Since Vaadin 25.1, Button contains a Text child
+            this.predicates.add { textComponent -> textComponent.parent.filter { (it is Button) }.isEmpty }
+        }.text }
         expectAfterLookupCalled()
         _get<TextField> { value = "Baron Vladimir Harkonnen" }  // test lookup by value
         expectAfterLookupCalled()