diff --git a/model/api/src/test/java/org/keycloak/models/PasswordPolicyTest.java b/model/api/src/test/java/org/keycloak/models/PasswordPolicyTest.java
index 4028cb8eece..65546b43d52 100644
--- a/model/api/src/test/java/org/keycloak/models/PasswordPolicyTest.java
+++ b/model/api/src/test/java/org/keycloak/models/PasswordPolicyTest.java
@@ -11,12 +11,12 @@ public class PasswordPolicyTest {
     @Test
     public void testLength() {
         PasswordPolicy policy = new PasswordPolicy("length");
-        Assert.assertEquals("invalidPasswordMinLengthMessages", policy.validate("1234567").getMessage());
+        Assert.assertEquals("invalidPasswordMinLengthMessage", policy.validate("1234567").getMessage());
         Assert.assertArrayEquals(new Object[]{8}, policy.validate("1234567").getParameters());
         Assert.assertNull(policy.validate("12345678"));
 
         policy = new PasswordPolicy("length(4)");
-        Assert.assertEquals("invalidPasswordMinLengthMessages", policy.validate("123").getMessage());
+        Assert.assertEquals("invalidPasswordMinLengthMessage", policy.validate("123").getMessage());
         Assert.assertArrayEquals(new Object[]{4}, policy.validate("123").getParameters());
         Assert.assertNull(policy.validate("1234"));
     }
@@ -24,12 +24,12 @@ public class PasswordPolicyTest {
     @Test
     public void testDigits() {
         PasswordPolicy policy = new PasswordPolicy("digits");
-        Assert.assertEquals("invalidPasswordMinDigitsMessages", policy.validate("abcd").getMessage());
+        Assert.assertEquals("invalidPasswordMinDigitsMessage", policy.validate("abcd").getMessage());
         Assert.assertArrayEquals(new Object[]{1}, policy.validate("abcd").getParameters());
         Assert.assertNull(policy.validate("abcd1"));
 
         policy = new PasswordPolicy("digits(2)");
-        Assert.assertEquals("invalidPasswordMinDigitsMessages", policy.validate("abcd1").getMessage());
+        Assert.assertEquals("invalidPasswordMinDigitsMessage", policy.validate("abcd1").getMessage());
         Assert.assertArrayEquals(new Object[]{2}, policy.validate("abcd1").getParameters());
         Assert.assertNull(policy.validate("abcd12"));
     }
@@ -37,12 +37,12 @@ public class PasswordPolicyTest {
     @Test
     public void testLowerCase() {
         PasswordPolicy policy = new PasswordPolicy("lowerCase");
-        Assert.assertEquals("invalidPasswordMinLowerCaseCharsMessages", policy.validate("ABCD1234").getMessage());
+        Assert.assertEquals("invalidPasswordMinLowerCaseCharsMessage", policy.validate("ABCD1234").getMessage());
         Assert.assertArrayEquals(new Object[]{1}, policy.validate("ABCD1234").getParameters());
         Assert.assertNull(policy.validate("ABcD1234"));
 
         policy = new PasswordPolicy("lowerCase(2)");
-        Assert.assertEquals("invalidPasswordMinLowerCaseCharsMessages", policy.validate("ABcD1234").getMessage());
+        Assert.assertEquals("invalidPasswordMinLowerCaseCharsMessage", policy.validate("ABcD1234").getMessage());
         Assert.assertArrayEquals(new Object[]{2}, policy.validate("ABcD1234").getParameters());
         Assert.assertNull(policy.validate("aBcD1234"));
     }
@@ -50,12 +50,12 @@ public class PasswordPolicyTest {
     @Test
     public void testUpperCase() {
         PasswordPolicy policy = new PasswordPolicy("upperCase");
-        Assert.assertEquals("invalidPasswordMinUpperCaseCharsMessages", policy.validate("abcd1234").getMessage());
+        Assert.assertEquals("invalidPasswordMinUpperCaseCharsMessage", policy.validate("abcd1234").getMessage());
         Assert.assertArrayEquals(new Object[]{1}, policy.validate("abcd1234").getParameters());
         Assert.assertNull(policy.validate("abCd1234"));
 
         policy = new PasswordPolicy("upperCase(2)");
-        Assert.assertEquals("invalidPasswordMinUpperCaseCharsMessages", policy.validate("abCd1234").getMessage());
+        Assert.assertEquals("invalidPasswordMinUpperCaseCharsMessage", policy.validate("abCd1234").getMessage());
         Assert.assertArrayEquals(new Object[]{2}, policy.validate("abCd1234").getParameters());
         Assert.assertNull(policy.validate("AbCd1234"));
     }
@@ -63,12 +63,12 @@ public class PasswordPolicyTest {
     @Test
     public void testSpecialChars() {
         PasswordPolicy policy = new PasswordPolicy("specialChars");
-        Assert.assertEquals("invalidPasswordMinSpecialCharsMessages", policy.validate("abcd1234").getMessage());
+        Assert.assertEquals("invalidPasswordMinSpecialCharsMessage", policy.validate("abcd1234").getMessage());
         Assert.assertArrayEquals(new Object[]{1}, policy.validate("abcd1234").getParameters());
         Assert.assertNull(policy.validate("ab&d1234"));
 
         policy = new PasswordPolicy("specialChars(2)");
-        Assert.assertEquals("invalidPasswordMinSpecialCharsMessages", policy.validate("ab&d1234").getMessage());
+        Assert.assertEquals("invalidPasswordMinSpecialCharsMessage", policy.validate("ab&d1234").getMessage());
         Assert.assertArrayEquals(new Object[]{2}, policy.validate("ab&d1234").getParameters());
         Assert.assertNull(policy.validate("ab&d-234"));
     }