diff --git a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java
index d51dcab..6f7a10f 100644
--- a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java
+++ b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java
@@ -68,9 +68,6 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.function.client.WebClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.cloud.appbroker.acceptance.fixtures.cf.CloudFoundryClientConfiguration.ACCEPTANCE_TEST_OAUTH_CLIENT_AUTHORITIES;
-import static org.springframework.cloud.appbroker.acceptance.fixtures.cf.CloudFoundryClientConfiguration.ACCEPTANCE_TEST_OAUTH_CLIENT_ID;
-import static org.springframework.cloud.appbroker.acceptance.fixtures.cf.CloudFoundryClientConfiguration.ACCEPTANCE_TEST_OAUTH_CLIENT_SECRET;
 import static org.springframework.cloud.appbroker.acceptance.fixtures.cf.CloudFoundryClientConfiguration.APP_BROKER_CLIENT_AUTHORITIES;
 import static org.springframework.cloud.appbroker.acceptance.fixtures.cf.CloudFoundryClientConfiguration.APP_BROKER_CLIENT_SECRET;
 
@@ -186,10 +183,6 @@ abstract class CloudFoundryAcceptanceTest {
 				.getOrCreateDefaultSpace()
 				.map(SpaceSummary::getId)
 				.flatMap(spaceId -> cleanup(orgId, spaceId)
-					.then(uaaService.createClient(
-						ACCEPTANCE_TEST_OAUTH_CLIENT_ID,
-						ACCEPTANCE_TEST_OAUTH_CLIENT_SECRET,
-						ACCEPTANCE_TEST_OAUTH_CLIENT_AUTHORITIES))
 					.then(uaaService.createClient(
 						brokerClientId(),
 						APP_BROKER_CLIENT_SECRET,
diff --git a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CreateInstanceWithOAuth2CredentialsAcceptanceTest.java b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CreateInstanceWithOAuth2CredentialsAcceptanceTest.java
index 036e146..adaec3c 100644
--- a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CreateInstanceWithOAuth2CredentialsAcceptanceTest.java
+++ b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CreateInstanceWithOAuth2CredentialsAcceptanceTest.java
@@ -22,13 +22,10 @@ import com.jayway.jsonpath.DocumentContext;
 import org.cloudfoundry.operations.applications.ApplicationSummary;
 import org.cloudfoundry.uaa.clients.GetClientResponse;
 import org.cloudfoundry.uaa.tokens.GrantType;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Disabled("This test can only be run with a Cloud Foundry user or client that has 'client.write' authority, " +
-	"so it should not be run in CI")
 class CreateInstanceWithOAuth2CredentialsAcceptanceTest extends CloudFoundryAcceptanceTest {
 
 	private static final String APP_NAME = "app-create-oauth2";
@@ -84,9 +81,9 @@ class CreateInstanceWithOAuth2CredentialsAcceptanceTest extends CloudFoundryAcce
 
 		// and has the environment variables
 		DocumentContext json = getSpringAppJson(APP_NAME);
-		assertThat(json.read("$.spring.security.oauth2.client.registration.sample-app-client.client-id").toString())
+		assertThat(json.read("$.['spring.security.oauth2.client.registration.sample-app-client.client-id']").toString())
 			.isEqualTo(uaaClientId(serviceInstanceGuid));
-		assertThat(json.read("$.spring.security.oauth2.client.registration.sample-app-client.client-secret").toString())
+		assertThat(json.read("$.['spring.security.oauth2.client.registration.sample-app-client.client-secret']").toString())
 			.matches("[a-zA-Z]{12}");
 
 		// and a UAA client is created
diff --git a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryClientConfiguration.java b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryClientConfiguration.java
index 11ee24a..3da4c49 100644
--- a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryClientConfiguration.java
+++ b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryClientConfiguration.java
@@ -42,20 +42,9 @@ import org.springframework.context.annotation.Configuration;
 @EnableConfigurationProperties(CloudFoundryProperties.class)
 public class CloudFoundryClientConfiguration {
 
-	public static final String ACCEPTANCE_TEST_OAUTH_CLIENT_ID = "acceptance-test-client";
-	public static final String ACCEPTANCE_TEST_OAUTH_CLIENT_SECRET = "acceptance-test-client-secret";
-	public static final String[] ACCEPTANCE_TEST_OAUTH_CLIENT_AUTHORITIES = {
-		"openid",
-		"cloud_controller.admin",
-		"cloud_controller.read",
-		"cloud_controller.write",
-		"clients.read",
-		"clients.write"
-	};
-
 	public static final String APP_BROKER_CLIENT_SECRET = "app-broker-client-secret";
 	public static final String[] APP_BROKER_CLIENT_AUTHORITIES = {
-		"cloud_controller.read", "cloud_controller.write"
+		"cloud_controller.read", "cloud_controller.write", "clients.write"
 	};
 
 	@Bean