keycloak-aplcache

diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-4.0.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-4.0.0.xml
index 78c606a..f7ebc68 100644
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-4.0.0.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-4.0.0.xml
@@ -27,6 +27,6 @@
                 <constraints nullable="false"/>
             </column>
         </createTable>
-        <addPrimaryKey columnNames="CLIENT_ID, BINDING_NAME" constraintName="CONSTRAINT_CLIENT_AUTH_FLOW_BINDINGS" tableName="CLIENT_AUTH_FLOW_BINDINGS"/>
+        <addPrimaryKey columnNames="CLIENT_ID, BINDING_NAME" constraintName="C_CLI_FLOW_BIND" tableName="CLIENT_AUTH_FLOW_BINDINGS"/>
     </changeSet>
 </databaseChangeLog>

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java
index ca0d877..732ba0f 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java
@@ -197,10 +197,6 @@ public class OAuthClient {
         origin = null;
     }
 
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
     public AuthorizationEndpointResponse doLogin(String username, String password) {
         openLoginForm();
         fillLoginForm(username, password);

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java
index 2ccaff8..33bb259 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java
@@ -201,7 +201,7 @@ public class FlowOverrideTest extends AbstractTestRealmKeycloakTest {
 
     @Test
     public void testWithClientBrowserOverride() throws Exception {
-        oauth.setClientId(TEST_APP_FLOW);
+        oauth.clientId(TEST_APP_FLOW);
         String loginFormUrl = oauth.getLoginFormUrl();
         log.info("loginFormUrl: " + loginFormUrl);
 
@@ -231,7 +231,7 @@ public class FlowOverrideTest extends AbstractTestRealmKeycloakTest {
     }
 
     private void testNoOverrideBrowser(String clientId) {
-        oauth.setClientId(clientId);
+        oauth.clientId(clientId);
         String loginFormUrl = oauth.getLoginFormUrl();
         log.info("loginFormUrl: " + loginFormUrl);