diff --git a/hapi-fhir-structures-dstu2.1/pom.xml b/hapi-fhir-structures-dstu2.1/pom.xml
index ad5f0af60c0..f3ee76e5e01 100644
--- a/hapi-fhir-structures-dstu2.1/pom.xml
+++ b/hapi-fhir-structures-dstu2.1/pom.xml
@@ -184,7 +184,6 @@
 				<configuration>
 					<!--<redirectTestOutputToFile>false</redirectTestOutputToFile>-->
 					<runOrder>random</runOrder>
-					<argLine>-Dfile.encoding=UTF-8</argLine>
 					<reuseForks>false</reuseForks>
 				</configuration>
 			</plugin>
diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java
index 1cd6723a363..d98695bf313 100644
--- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java
+++ b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java
@@ -896,7 +896,7 @@ public class JsonParserDstu21Test {
 	@Test
 	public void testReportSerialize() {
 
-		ReportObservation obsv = new ReportObservation();
+		ReportObservationDstu21 obsv = new ReportObservationDstu21();
 		obsv.getCode().addCoding().setCode("name");
 		obsv.setValue(new StringType("value test"));
 		obsv.setStatus(ObservationStatus.FINAL);
@@ -918,7 +918,7 @@ public class JsonParserDstu21Test {
 	@Test
 	public void testReportSerializeWithMatchingId() {
 
-		ReportObservation obsv = new ReportObservation();
+		ReportObservationDstu21 obsv = new ReportObservationDstu21();
 		obsv.getCode().addCoding().setCode("name");
 		obsv.setValue(new StringType("value test"));
 		obsv.setStatus(ObservationStatus.FINAL);
diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservation.java b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu21.java
similarity index 90%
rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservation.java
rename to hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu21.java
index 195229b94e4..bbe64faf28a 100644
--- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservation.java
+++ b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu21.java
@@ -11,7 +11,7 @@ import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.util.ElementUtil;
 
 @ResourceDef(name = "Observation", id = "reportobservation")
-public class ReportObservation extends Observation {
+public class ReportObservationDstu21 extends Observation {
 
 	/**
 	 * Each extension is defined in a field. Any valid HAPI Data Type can be used for the field type. Note that the
@@ -62,7 +62,7 @@ public class ReportObservation extends Observation {
 	}
 
 	/** Setter for mandatory */
-	public ReportObservation setMandatory(Boolean isMandatory) {
+	public ReportObservationDstu21 setMandatory(Boolean isMandatory) {
 		mandatory = new BooleanType(isMandatory);
 		return this;
 	}
@@ -76,7 +76,7 @@ public class ReportObservation extends Observation {
 	}
 
 	/** Setter for readOnly */
-	public ReportObservation setReadOnly(Boolean isReadOnly) {
+	public ReportObservationDstu21 setReadOnly(Boolean isReadOnly) {
 		readOnly = new BooleanType(isReadOnly);
 		return this;
 	}
@@ -90,7 +90,7 @@ public class ReportObservation extends Observation {
 	}
 
 	/** Setter for defaultCursor */
-	public ReportObservation setDefaultCursor(Boolean isDefaultCursor) {
+	public ReportObservationDstu21 setDefaultCursor(Boolean isDefaultCursor) {
 		defaultCursor = new BooleanType(isDefaultCursor);
 		return this;
 	}
@@ -104,7 +104,7 @@ public class ReportObservation extends Observation {
 	}
 
 	/** Setter for sectionContentId */
-	public ReportObservation setSectionContentId(String sectionContentId) {
+	public ReportObservationDstu21 setSectionContentId(String sectionContentId) {
 		this.sectionContentId = new StringType(sectionContentId);
 		return this;
 	}
diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml
index ca7b7a2441a..56afa22cba7 100644
--- a/hapi-fhir-structures-hl7org-dstu2/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml
@@ -181,9 +181,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<redirectTestOutputToFile>true</redirectTestOutputToFile>
-					<runOrder>random</runOrder>
-					<argLine>-Dfile.encoding=UTF-8</argLine>
+					<!--<redirectTestOutputToFile>true</redirectTestOutputToFile>-->
 					<reuseForks>false</reuseForks>
 				</configuration>
 			</plugin>
diff --git a/pom.xml b/pom.xml
index 454f44c38e1..9e71bfbfd1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -741,7 +741,7 @@
 					<configuration>
 						<redirectTestOutputToFile>true</redirectTestOutputToFile>
 						<runOrder>random</runOrder>
-						<argLine>-Dfile.encoding=UTF-8 -Xmx512m</argLine>
+						<argLine>-Dfile.encoding=UTF-8 -Xmx712m</argLine>
 						<forkCount>1</forkCount>
 						<!--<reuseForks>false</reuseForks>-->
 					</configuration>