diff --git a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java
index a5a0531597b..dfe278931aa 100644
--- a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java
+++ b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.master.springboot;
 
 import java.util.Map;
+import java.util.UUID;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;
@@ -71,8 +72,9 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         setupClusterService();
         return new RouteBuilder() {
             public void configure() {
+                final String randomMasterId = UUID.randomUUID().toString();
                 context.addComponent("dummy", new DummyComponent());
-                from("master:test:dummy://path?foo=hello}+world&bar=RAW(hello}+world)")
+                from("master:" + randomMasterId + ":dummy://path?foo=hello}+world&bar=RAW(hello}+world)")
                         .to("mock:result");
             }
         };
diff --git a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
index d4c3585e0ea..c28adc9c788 100644
--- a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
+++ b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
@@ -179,8 +179,11 @@ public MongoDbComponent mongoDbComponent() {
 		}
 
 		@Bean
-		public void propertyLocation() {
+		public String propertyLocation() {
+			String propertyLocation = "classpath:mongodb.test.properties";
 			context.getPropertiesComponent().setLocation("classpath:mongodb.test.properties");
+
+			return propertyLocation;
 		}
 	}
 }
diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml
index e5c95f8c65f..139831b828e 100644
--- a/core/camel-spring-boot/pom.xml
+++ b/core/camel-spring-boot/pom.xml
@@ -58,6 +58,12 @@
             <optional>true</optional>
             <version>${spring-boot-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator</artifactId>
+            <scope>compile</scope> <!-- Avoid ClassNotFound AvailabilityStateHealthIndicator -->
+            <version>${spring-boot-version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>