diff --git a/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/ComponentQueryTest.java b/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/ComponentQueryTest.java
index aab893bd4..1af43077b 100644
--- a/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/ComponentQueryTest.java
+++ b/vaadin-testbench-unit-junit5/src/test/java/com/vaadin/testbench/unit/ComponentQueryTest.java
@@ -25,8 +25,8 @@
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.textfield.IntegerField;
-import com.vaadin.flow.component.textfield.InternalFieldBase;
 import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.component.textfield.TextFieldBase;
 import com.vaadin.flow.dom.Element;
 import com.vaadin.testbench.unit.ComponentTesterTest.Span;
 import com.vaadin.testbench.unit.ElementConditionsTest.TextComponent;
@@ -493,7 +493,7 @@ void withValue_expectedNull_findsAllComponent() {
         rootElement.appendChild(otherField.getElement());
 
         Assertions.assertIterableEquals(List.of(targetField, otherField),
-                $(InternalFieldBase.class).withValue(null).all());
+                $(TextFieldBase.class).withValue(null).all());
     }
 
     @Test
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java
index bdc306bcf..f15b0ca50 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java
@@ -24,7 +24,7 @@
  */
 @Tests({ TextField.class, PasswordField.class, EmailField.class,
         BigDecimalField.class })
-public class TextFieldTester<T extends InternalFieldBase<T, V>, V>
+public class TextFieldTester<T extends TextFieldBase<T, V>, V>
         extends ComponentTester<T> {
 
     /**