diff --git a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/AbstractValidationBinderIT.java b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/AbstractValidationBinderIT.java
index 779148e7eed..56daf50e2e7 100644
--- a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/AbstractValidationBinderIT.java
+++ b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/AbstractValidationBinderIT.java
@@ -38,6 +38,7 @@ public void init() {
     public void required_fieldIsInitiallyValid() {
         assertClientValid(true);
         assertServerValid(true);
+        assertErrorMessage(null);
     }
 
     @Test
diff --git a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationBinderIT.java b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationBinderIT.java
index f01120b7ba6..68d7f83c383 100644
--- a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationBinderIT.java
+++ b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationBinderIT.java
@@ -35,6 +35,7 @@ public void minLength_changeInputValue_assertValidity() {
         field.setValue("A");
         assertClientValid(false);
         assertServerValid(false);
+        assertErrorMessage("");
 
         // Binder validation fails:
         field.setValue("AA");
@@ -60,6 +61,7 @@ public void maxLength_changeInputValue_assertValidity() {
         field.setValue("AAA");
         assertClientValid(false);
         assertServerValid(false);
+        assertErrorMessage("");
 
         // Binder validation fails:
         field.setValue("AA");
@@ -85,6 +87,7 @@ public void pattern_changeInputValue_assertValidity() {
         field.setValue("Word");
         assertClientValid(false);
         assertServerValid(false);
+        assertErrorMessage("");
 
         // Binder validation fails:
         field.setValue("12");
diff --git a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationIT.java b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationIT.java
index 90ee63ccfbc..7f78cf532d1 100644
--- a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationIT.java
+++ b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/validation/TextFieldValidationIT.java
@@ -29,10 +29,14 @@ public void minLength_changeInputValue_assertValidity() {
         $("input").id(TextFieldValidationPage.MIN_LENGTH_INPUT).sendKeys("2",
                 Keys.ENTER);
 
-        field.setValue("AA");
+        field.setValue("A");
         assertClientValid(false);
         assertServerValid(false);
 
+        field.setValue("AA");
+        assertClientValid(true);
+        assertServerValid(true);
+
         field.setValue("AAA");
         assertClientValid(true);
         assertServerValid(true);
@@ -43,10 +47,14 @@ public void maxLength_changeInputValue_assertValidity() {
         $("input").id(TextFieldValidationPage.MAX_LENGTH_INPUT).sendKeys("2",
                 Keys.ENTER);
 
-        field.setValue("AA");
+        field.setValue("AAA");
         assertClientValid(false);
         assertServerValid(false);
 
+        field.setValue("AA");
+        assertClientValid(true);
+        assertServerValid(true);
+
         field.setValue("A");
         assertClientValid(true);
         assertServerValid(true);