diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.classpath b/hapi-fhir-jpaserver-uhnfhirtest/.classpath
index c998deb489c..d3c5af89fef 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/.classpath
+++ b/hapi-fhir-jpaserver-uhnfhirtest/.classpath
@@ -6,7 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/tinder"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index a06ba038432..968641f543c 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@@ -9,6 +9,7 @@
 	</parent>
 
 	<artifactId>hapi-fhir-jpaserver-uhnfhirtest</artifactId>
+	<packaging>war</packaging>
 
 	<name>HAPI FHIR - fhirtest.uhn.ca Deployable WAR</name>
 
@@ -215,5 +216,4 @@
 		<finalName>hapi-fhir-jpaserver</finalName>
 	</build>
 
-	<packaging>war</packaging>
 </project>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
index deba44afdd1..bf4786fb6af 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
@@ -55,15 +55,21 @@ public class TestRestfulServer extends RestfulServer {
 		myAppCtx = ContextLoaderListener.getCurrentWebApplicationContext();
 		
 		List<IResourceProvider> beans;
+		JpaSystemProvider systemProvider;
+		IFhirSystemDao systemDao;
 		switch (fhirVersionParam.trim().toUpperCase()) {
 		case "DSTU":
 		case "DSTU1":
 			setFhirContext(FhirContext.forDstu1());
 			beans = myAppCtx.getBean("myResourceProvidersDstu1", List.class);
+			systemProvider = myAppCtx.getBean("mySystemProviderDstu1", JpaSystemProvider.class);
+			systemDao = myAppCtx.getBean("mySystemDaoDstu1", IFhirSystemDao.class);
 			break;
 		case "DEV":
 			setFhirContext(FhirContext.forDev());
 			beans = myAppCtx.getBean("myResourceProvidersDev", List.class);
+			systemProvider = myAppCtx.getBean("mySystemProviderDev", JpaSystemProvider.class);
+			systemDao = myAppCtx.getBean("mySystemDaoDev", IFhirSystemDao.class);
 			break;
 		default:
 			throw new ServletException("Unknown FHIR version specified in init-param[FhirVersion]: " + fhirVersionParam);
@@ -76,10 +82,7 @@ public class TestRestfulServer extends RestfulServer {
 			ourLog.info(" * Have resource provider for: {}", nextResourceProvider.getResourceType().getSimpleName());
 		}
 		setResourceProviders(beans);
-		
-		IFhirSystemDao systemDao = myAppCtx.getBean(IFhirSystemDao.class);
-		JpaSystemProvider sp = new JpaSystemProvider(systemDao);
-		setPlainProviders(sp);
+		setPlainProviders(systemProvider);
 		
 		String implDesc = getInitParameter("ImplementationDescription");
 		
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml
index 83288cd6cd4..3922d51ebb8 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml
@@ -16,9 +16,6 @@
 	<bean id="myDaoConfig" class="ca.uhn.fhir.jpa.dao.DaoConfig">
 	</bean>
 
-	<bean id="mySystemDao" class="ca.uhn.fhir.jpa.dao.FhirSystemDao">
-	</bean>
-
 	<bean id="myTxManager" class="org.springframework.orm.jpa.JpaTransactionManager">
 		<property name="entityManagerFactory" ref="myEntityManagerFactory" />
 	</bean>