diff --git a/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfiguration.java b/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfiguration.java
index a2892b0..da9d435 100644
--- a/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfiguration.java
+++ b/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfiguration.java
@@ -4,7 +4,6 @@
 import com.solace.spring.boot.autoconfigure.SolaceOAuthClientConfiguration.SolaceOAuth2SchemeCondition;
 import com.solacesystems.jcsmp.DefaultSolaceSessionOAuth2TokenProvider;
 import com.solacesystems.jcsmp.JCSMPProperties;
-import java.util.Objects;
 import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.context.annotation.Bean;
diff --git a/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/test/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfigurationTest.java b/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/test/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfigurationTest.java
index 4d0d93b..c752372 100644
--- a/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/test/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfigurationTest.java
+++ b/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/test/java/com/solace/spring/boot/autoconfigure/SolaceOAuthClientConfigurationTest.java
@@ -1,7 +1,5 @@
 package com.solace.spring.boot.autoconfigure;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import com.solacesystems.jcsmp.SolaceSessionOAuth2TokenProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -10,6 +8,9 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 class SolaceOAuthClientConfigurationTest {
 
   @SpringBootApplication
@@ -23,7 +24,8 @@ void verifyApplicationContextContainsRequiredBeans() {
         .profiles("oauthConfigIT").sources(TestApp.class)
         .properties(
             String.format("%s=%s", "solace.java.api-properties.AUTHENTICATION_SCHEME", "AUTHENTICATION_SCHEME_OAUTH2"),
-            String.format("%s=%s", "solace.java.oauth2ClientRegistrationId", "my-oauth2-client"))
+            String.format("%s=%s", "solace.java.oauth2ClientRegistrationId", "my-oauth2-client"),
+            "server.port=0")
         .run()) {
       assertThat(context.isRunning()).isTrue();
       assertThat(context.getBean(SolaceSessionOAuth2TokenProvider.class)).isNotNull();
@@ -38,7 +40,8 @@ void verifyApplicationContextContainsRequiredBeans2() {
         .profiles("oauthConfigIT").sources(TestApp.class)
         .properties(
             String.format("%s=%s", "solace.java.apiProperties.AUTHENTICATION_SCHEME", "AUTHENTICATION_SCHEME_OAUTH2"),
-            String.format("%s=%s", "solace.java.oauth2-client-registration-id", "my-oauth2-client"))
+            String.format("%s=%s", "solace.java.oauth2-client-registration-id", "my-oauth2-client"),
+            "server.port=0")
         .run()) {
       assertThat(context.isRunning()).isTrue();
       assertThat(context.getBean(SolaceSessionOAuth2TokenProvider.class)).isNotNull();
@@ -53,7 +56,8 @@ void verifyApplicationContextDoesNotContainOAuth2BeansWhenAuthSchemeIsNotOAuth2(
         .profiles("oauthConfigIT").sources(TestApp.class)
         .properties(
             String.format("%s=%s", "solace.java.apiProperties.AUTHENTICATION_SCHEME", "AUTHENTICATION_SCHEME_BASIC"),
-            String.format("%s=%s", "solace.java.oauth2ClientRegistrationId", "my-oauth2-client"))
+            String.format("%s=%s", "solace.java.oauth2ClientRegistrationId", "my-oauth2-client"),
+            "server.port=0")
         .run()) {
       assertThat(context.isRunning()).isTrue();
 
@@ -69,7 +73,8 @@ void verifyApplicationContextDoesNotContainOAuth2BeansWhenAuthSchemeIsNotOAuth2(
   void verifyApplicationContextDoesNotContainOAuth2BeansWhenAuthSchemePropertyNotDefined() {
     try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
         .profiles("oauthConfigIT").sources(TestApp.class)
-        .properties(String.format("%s=%s", "solace.java.oauth2ClientRegistrationId", "my-oauth2-client"))
+        .properties(String.format("%s=%s", "solace.java.oauth2ClientRegistrationId", "my-oauth2-client"),
+                "server.port=0")
         .run()) {
       assertThat(context.isRunning()).isTrue();
 
@@ -85,7 +90,8 @@ void verifyApplicationContextDoesNotContainOAuth2BeansWhenAuthSchemePropertyNotD
   void verifyApplicationContextDoesNotContainOAuth2BeansWhenClientRegistrationIdNotDefined() {
     try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
         .profiles("oauthConfigIT").sources(TestApp.class)
-        .properties(String.format("%s=%s", "solace.java.apiProperties.AUTHENTICATION_SCHEME", "AUTHENTICATION_SCHEME_OAUTH2"))
+        .properties(String.format("%s=%s", "solace.java.apiProperties.AUTHENTICATION_SCHEME", "AUTHENTICATION_SCHEME_OAUTH2"),
+                "server.port=0")
         .run()) {
       assertThat(context.isRunning()).isTrue();