diff --git a/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java b/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
index d32dfb9ec0..b6b5e14ddc 100644
--- a/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
+++ b/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
@@ -116,11 +116,6 @@ public void invalidResetPasswordFieldEntries()
    @Test
    public void emptyResetPasswordFieldEntries()
    {
-      // Both are valid, but show seemingly at random
-      List<String> emptyUsernameErrors = new ArrayList<String>();
-      emptyUsernameErrors.add("size must be between 3 and 20");
-      emptyUsernameErrors.add("must match ^[a-z\\d_]{3,20}$");
-
       SignInPage signInPage = new BasicWorkFlow().goToHome().clickSignInLink();
       ResetPasswordPage resetPasswordPage = signInPage.gotToResetPassword();
       resetPasswordPage = resetPasswordPage.clearFields();
@@ -129,8 +124,11 @@ public void emptyResetPasswordFieldEntries()
       assertThat("Empty email error is displayed", resetPasswordPage.waitForErrors(),
             hasItem("may not be empty"));
 
-
-      assertThat(resetPasswordPage.getErrors().get(0), equalTo("may not be empty"));
+      // All are valid, but may show at random
+      assertThat(resetPasswordPage.getErrors().get(0),
+            either(equalTo("size must be between 3 and 20"))
+                  .or(equalTo("may not be empty"))
+                  .or(equalTo("must match ^[a-z\\d_]{3,20}$")));
 
    }