diff --git a/spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/uaa/UaaService.java b/spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/uaa/UaaService.java
index a1412e2..fc72b8f 100644
--- a/spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/uaa/UaaService.java
+++ b/spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/uaa/UaaService.java
@@ -61,7 +61,7 @@ public class UaaService {
 			.delayUntil(response -> {
 				if (!clientNotFound.equals(response.getClientId())) {
 					return uaaClient.clients()
-				.delete(DeleteClientRequest.builder().clientId(clientId).build())
+						.delete(DeleteClientRequest.builder().clientId(clientId).build())
 						.doOnError(error -> LOG.error("Error deleting client: " + clientId + " with error: " + error));
 				}
 				return Mono.empty();
@@ -74,6 +74,7 @@ public class UaaService {
 					.authorizedGrantType(GrantType.CLIENT_CREDENTIALS)
 					.authorities(authorities)
 					.build())
+				.onErrorResume(e -> e.getMessage().contains("Client already exists: " + clientId), e -> Mono.empty())
 				.doOnError(error -> LOG.error("Error creating client: " + clientId + " with error: " + error)))
 			.then();
 	}