keycloak-aplcache

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java
index d29be72..85ad4b6 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java
@@ -42,7 +42,7 @@ public class LoginForm extends Form {
 //    @FindBy(name = "cancel")
 //    private WebElement cancelButton;
 
-    @FindBy(linkText = "Register")
+    @FindBy(xpath = "//div[@id='kc-registration']/span/a")
     private WebElement registerLink;
     @FindBy(linkText = "Forgot Password?")
     private WebElement forgottenPassword;

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/RegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/RegistrationTest.java
index f23741e..c731ca1 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/RegistrationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/RegistrationTest.java
@@ -70,8 +70,9 @@ public class RegistrationTest extends AbstractAccountManagementTest {
     }
 
     public void assertMessageAttributeMissing(String attributeName) {
-        assertTrue(testRealmRegistrationPage.getFeedbackText()
-                .contains("Please specify " + attributeName + "."));
+        String feedbackTest = testRealmRegistrationPage.getFeedbackText();
+        String contains = "Please specify " + attributeName + ".";
+        assertTrue("'" + contains + "' doesn't contain '" + feedbackTest + "'", feedbackTest.contains(contains));
     }
 
     @Test
@@ -84,8 +85,7 @@ public class RegistrationTest extends AbstractAccountManagementTest {
     public void invalidEmail() {
         newUser.setEmail("invalid.email.value");
         testRealmRegistrationPage.register(newUser);
-        assertTrue(testRealmRegistrationPage.getFeedbackText()
-                .equals("Invalid email address."));
+        assertEquals("Invalid email address.", testRealmRegistrationPage.getFeedbackText());
         assertUserDoesntExistWithAdminClient(newUser);
     }
 
@@ -121,8 +121,7 @@ public class RegistrationTest extends AbstractAccountManagementTest {
     public void notMatchingPasswords() {
         testRealmRegistrationPage.setValues(newUser, "not-matching-password");
         testRealmRegistrationPage.submit();
-        assertTrue(testRealmRegistrationPage.getFeedbackText()
-                .equals("Password confirmation doesn't match."));
+        assertEquals("Password confirmation doesn't match.", testRealmRegistrationPage.getFeedbackText());
 
         testRealmRegistrationPage.register(newUser);
         assertUserExistsWithAdminClient(newUser);