diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index ec63c801426..3c9ff3756b6 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -149,6 +149,7 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-jpaserver-batch</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/hapi-fhir-jpaserver-batch/pom.xml b/hapi-fhir-jpaserver-batch/pom.xml
index 5ba8f4d0ef6..c0394d3e63e 100644
--- a/hapi-fhir-jpaserver-batch/pom.xml
+++ b/hapi-fhir-jpaserver-batch/pom.xml
@@ -16,11 +16,6 @@
 	<name>HAPI FHIR JPA Server - Batch Task Processor</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-migrate</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-core</artifactId>
@@ -55,14 +50,19 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-test-utilities</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.awaitility</groupId>
-			<artifactId>awaitility</artifactId>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-test-utilities</artifactId>
+			<version>5.1.0-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/hapi-fhir-jpaserver-batch/src/test/java/ca/uhn/fhir/jpa/batch/BaseBatchR4Test.java b/hapi-fhir-jpaserver-batch/src/test/java/ca/uhn/fhir/jpa/batch/BaseBatchR4Test.java
index f90b94abcde..fcc530fc9d2 100644
--- a/hapi-fhir-jpaserver-batch/src/test/java/ca/uhn/fhir/jpa/batch/BaseBatchR4Test.java
+++ b/hapi-fhir-jpaserver-batch/src/test/java/ca/uhn/fhir/jpa/batch/BaseBatchR4Test.java
@@ -1,16 +1,9 @@
 package ca.uhn.fhir.jpa.batch;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.batch.config.BatchJobConfig;
 import ca.uhn.fhir.jpa.batch.config.InMemoryJobRepositoryBatchConfig;
 import ca.uhn.fhir.jpa.batch.svc.DummyService;
-import ca.uhn.fhir.jpa.config.TestJpaR4Config;
-import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
-import org.hl7.fhir.r4.model.Patient;
-import org.hl7.fhir.r4.model.Person;
-import org.hl7.fhir.r4.model.Practitioner;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.springframework.batch.core.Job;
@@ -23,23 +16,13 @@ import org.springframework.transaction.PlatformTransactionManager;
 import static org.slf4j.LoggerFactory.getLogger;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {BatchJobConfig.class, InMemoryJobRepositoryBatchConfig.class, TestJpaR4Config.class})
-abstract public class BaseBatchR4Test extends BaseJpaR4Test {
+@ContextConfiguration(classes = {BatchJobConfig.class, InMemoryJobRepositoryBatchConfig.class})
+abstract public class BaseBatchR4Test {
  	private static final Logger ourLog = getLogger(BaseBatchR4Test.class);
 
  	@Autowired
 	protected PlatformTransactionManager myPlatformTransactionManager;
 
-	@Autowired
-	protected FhirContext myFhirContext;
-	@Autowired
-	protected IFhirResourceDao<Person> myPersonDao;
-	@Autowired
-	protected IFhirResourceDao<Patient> myPatientDao;
-	@Autowired
-	protected IFhirResourceDao<Practitioner> myPractitionerDao;
-	@Autowired
-	protected IdHelperService myIdHelperService;
 	@Autowired
 	protected DummyService myDummyService;
 	@Autowired
diff --git a/hapi-fhir-jpaserver-migrate/pom.xml b/hapi-fhir-jpaserver-migrate/pom.xml
index 3b5a3fc27e0..a64ca7c3256 100644
--- a/hapi-fhir-jpaserver-migrate/pom.xml
+++ b/hapi-fhir-jpaserver-migrate/pom.xml
@@ -42,13 +42,6 @@
 			<artifactId>hapi-fhir-jpaserver-base</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- Need this for the schema files from spring batch -->
-		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-core</artifactId>
-			<version>4.2.2.RELEASE</version>
-		</dependency>
-
 		<!-- Test Database -->
 		<dependency>
 			<groupId>com.h2database</groupId>