keycloak-uncached

diff --git a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/authentication/PasswordPolicy.java b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/authentication/PasswordPolicy.java
index fc26648..8f8073c 100644
--- a/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/authentication/PasswordPolicy.java
+++ b/testsuite/integration-arquillian/tests/other/console/src/main/java/org/keycloak/testsuite/console/page/authentication/PasswordPolicy.java
@@ -50,7 +50,9 @@ public class PasswordPolicy extends Authentication {
 
     public void removePolicy(Type policy) {
         getPolicyRow(policy).findElement(By.cssSelector("td.kc-action-cell")).click();
-        primaryButton.click();
+        if (primaryButton.isEnabled()) {
+            primaryButton.click();
+        }
         waitForPageToLoad(driver);
     }
 
@@ -60,7 +62,9 @@ public class PasswordPolicy extends Authentication {
 
     public void editPolicy(Type policy, String value) {
         setPolicyValue(policy, value);
-        primaryButton.click();
+        if (primaryButton.isEnabled()) {
+            primaryButton.click();
+        }
         waitForPageToLoad(driver);
     }