diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java
index 6d9e321564d..fee9512ff44 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java
@@ -11,6 +11,8 @@ import ca.uhn.fhir.empi.rules.similarity.EmpiSimilarityEnum;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.BeforeEach;
 
+import java.util.ArrayList;
+
 public abstract class BaseEmpiRulesR4Test extends BaseR4Test {
 	public static final String PATIENT_GIVEN = "patient-given";
 	public static final String PATIENT_FAMILY = "patient-last";
@@ -18,9 +20,16 @@ public abstract class BaseEmpiRulesR4Test extends BaseR4Test {
 	public static final double NAME_THRESHOLD = 0.8;
 	protected EmpiFieldMatchJson myGivenNameMatchField;
 	protected String myBothNameFields;
+	protected EmpiRulesJson myEmpiRulesJson;
 
 	@BeforeEach
 	public void before() {
+		myEmpiRulesJson = new EmpiRulesJson();
+
+		ArrayList<String> myLegalMdmTypes = new ArrayList<>();
+		myLegalMdmTypes.add("Patient");
+		myEmpiRulesJson.setMdmTypes(myLegalMdmTypes);
+
 		myGivenNameMatchField = new EmpiFieldMatchJson()
 			.setName(PATIENT_GIVEN)
 			.setResourceType("Patient")
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java
index fc1eb0e084a..e41ff1e36d9 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java
@@ -23,16 +23,12 @@ public class EmpiResourceFieldMatcherR4Test extends BaseEmpiRulesR4Test {
 	protected EmpiResourceFieldMatcher myComparator;
 	private Patient myJohn;
 	private Patient myJohny;
-	private EmpiRulesJson myEmpiRulesJson;
 
 	@Override
 	@BeforeEach
 	public void before() {
 		super.before();
 
-		ArrayList<String>  myLegalMdmTypes = new ArrayList<>();
-		//myLegalMdmTypes.add("Patient");
-		myEmpiRulesJson.setMdmTypes(myLegalMdmTypes);
 		myComparator = new EmpiResourceFieldMatcher(ourFhirContext, myGivenNameMatchField, myEmpiRulesJson);
 		myJohn = buildJohn();
 		myJohny = buildJohny();