diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.module.css
index 2a3e511d7b..f11c598f44 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.module.css
@@ -16,6 +16,6 @@
   height: 100%;
   background-color: gray;
 }
-.password-confirm-match {
+.password-confirm-message {
   visibility: hidden;
 }
diff --git a/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php b/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php
index 3ec20f25ac..b274eb2b02 100644
--- a/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php
+++ b/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php
@@ -104,13 +104,16 @@ public function testPasswordConfirmWidgetJsComponents() {
     // Deleting the input must not change the element above.
     $password_confirm_widget->fillField('Password', 'o');
     $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
-    $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions > ul > li")->isVisible());
+    $this->assertFalse($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions > ul > li")->isVisible());
     $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text" data-drupal-selector="password-strength-text">Weak</span></div>');
 
     // Now fill both the main and confirm input.
     $password_confirm_widget->fillField('Password', 'oooooooooO0∘');
     $password_confirm_widget->fillField('Confirm password', 'oooooooooO0∘');
 
+    // Password match message must become visible.
+    $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions > ul > li")->isVisible());
+
     // Bar should be 100% wide.
     $this->assert->elementAttributeContains('css', 'input.js-password-field + .password-strength > [data-drupal-selector="password-strength-meter"] [data-drupal-selector="password-strength-indicator"]', 'style', 'width: 100%;');
     $this->assert->elementTextContains('css', "$password_confirm_widget_selector $password_parent_selector [data-drupal-selector='password-strength-text']", 'Strong');
@@ -136,7 +139,6 @@ public function testPasswordConfirmMessage() {
 
     // Password match message.
     $this->assertTrue($password_confirm_item->has('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]'));
-    $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
     $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector", '<div aria-live="polite" aria-atomic="true" class="password-confirm-message" data-drupal-selector="password-confirm-message">Passwords match: <span data-drupal-selector="password-match-status-text"></span></div>');
   }
 
diff --git a/core/modules/user/tests/src/FunctionalJavascript/PasswordWidgetThemeFunctionTest.php b/core/modules/user/tests/src/FunctionalJavascript/PasswordWidgetThemeFunctionTest.php
index af11642b98..0a7e620e2a 100644
--- a/core/modules/user/tests/src/FunctionalJavascript/PasswordWidgetThemeFunctionTest.php
+++ b/core/modules/user/tests/src/FunctionalJavascript/PasswordWidgetThemeFunctionTest.php
@@ -55,9 +55,11 @@ public function testPasswordConfirmWidgetJsComponents() {
 
     $this->assertNotNull($assert_session->waitForText('Overridden passwordStrength:'));
     $assert_session->elementTextContains('css', '.password-strength__meter', 'Overridden passwordStrength:');
-    $assert_session->elementTextContains('css', '.password-confirm-message', 'Overridden passwordConfirmMessage:');
+    $assert_session->elementTextNotContains('css', '.password-confirm-message', 'Overridden passwordConfirmMessage:');
     $this->getSession()->getPage()->fillField('pass[pass1]', 'a');
     $assert_session->elementTextContains('css', '.password-suggestions', 'Overridden passwordSuggestions:');
+    $this->getSession()->getPage()->fillField('pass[pass1]', 'a');
+    $assert_session->elementTextContains('css', '.password-confirm-message', 'Overridden passwordConfirmMessage:');
   }
 
 }