diff --git a/pom.xml b/pom.xml
index 9766342..80dc78f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-		  <version>5.4.2</version>
+		  <version>5.5.0</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
index 2dcf32d..24dfada 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
@@ -1,11 +1,18 @@
 package ca.uhn.fhir.jpa.starter;
 
-import ca.uhn.fhir.context.ConfigurationException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.jpa.search.lastn.ElasticsearchSvcImpl;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;
 import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
+import java.io.IOException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import javax.annotation.PreDestroy;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.DateTimeType;
@@ -27,18 +34,6 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import org.testcontainers.junit.jupiter.Container;
-
-import javax.annotation.PreDestroy;
-import java.io.IOException;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties =
@@ -52,7 +47,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
     // "elasticsearch.rest_url='http://localhost:9200'",
     "elasticsearch.username=SomeUsername",
     "elasticsearch.password=SomePassword",
-	 "elasticsearch.protocol=http"
+	 "elasticsearch.protocol=http",
+	  "spring.main.allow-bean-definition-overriding=true"
   })
 @ContextConfiguration(initializers = ElasticsearchLastNR4IT.Initializer.class)
 public class ElasticsearchLastNR4IT {
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java
index 3aa1556..0b408de 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java
@@ -18,9 +18,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties =
   {
-    "spring.batch.job.enabled=false",
-    "hapi.fhir.fhir_version=dstu2",
-    "spring.datasource.url=jdbc:h2:mem:dbr2"
+     "spring.batch.job.enabled=false",
+     "hapi.fhir.fhir_version=dstu2",
+     "spring.datasource.url=jdbc:h2:mem:dbr2",
+	  "spring.main.allow-bean-definition-overriding=true"
   })
 public class ExampleServerDstu2IT {
 
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
index 41a4126..91cb4ba 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
@@ -39,13 +39,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties =
   {
-    "spring.batch.job.enabled=false",
-    "spring.datasource.url=jdbc:h2:mem:dbr3",
-    "hapi.fhir.cql_enabled=true",
-    "hapi.fhir.fhir_version=dstu3",
-    "hapi.fhir.subscription.websocket_enabled=true",
-    "hapi.fhir.allow_external_references=true",
-    "hapi.fhir.allow_placeholder_references=true",
+     "spring.batch.job.enabled=false",
+     "spring.datasource.url=jdbc:h2:mem:dbr3",
+     "hapi.fhir.cql_enabled=true",
+     "hapi.fhir.fhir_version=dstu3",
+     "hapi.fhir.subscription.websocket_enabled=true",
+     "hapi.fhir.allow_external_references=true",
+     "hapi.fhir.allow_placeholder_references=true",
+	  "spring.main.allow-bean-definition-overriding=true"
   })
 
 
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
index 56b7316..6a7fc52 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
@@ -34,11 +34,12 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties =
   {
-    "spring.batch.job.enabled=false",
-    "spring.datasource.url=jdbc:h2:mem:dbr5",
-    "hapi.fhir.fhir_version=r5",
-    "hapi.fhir.subscription.websocket_enabled=true",
-	 "hapi.fhir.subscription.websocket_enabled=true"
+     "spring.batch.job.enabled=false",
+     "spring.datasource.url=jdbc:h2:mem:dbr5",
+     "hapi.fhir.fhir_version=r5",
+     "hapi.fhir.subscription.websocket_enabled=true",
+	  "hapi.fhir.subscription.websocket_enabled=true",
+	  "spring.main.allow-bean-definition-overriding=true"
   })
 public class ExampleServerR5IT {
 
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
index f13a11a..d8ae7cf 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
@@ -24,7 +24,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
     "spring.datasource.url=jdbc:h2:mem:dbr4-mt",
     "hapi.fhir.fhir_version=r4",
     "hapi.fhir.subscription.websocket_enabled=true",
-    "hapi.fhir.partitioning.partitioning_include_in_search_hashes=false"
+    "hapi.fhir.partitioning.partitioning_include_in_search_hashes=false",
+	  "spring.main.allow-bean-definition-overriding=true"
 
   })
 public class MultitenantServerR4IT {