diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index 742681f5495..d9da6a758cf 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -727,6 +727,15 @@
 			</build>
 		</profile>
 		<profile>
+			<!--
+			This profile is used on the Travis CI server because the full test suite
+			runs for over 45 minutes on Travis, and Travis kills it.. So we don't execute
+			all of the tests there.
+
+			This seems like it must be an issue with Travis's environment, since AppVeyor
+			can run the full build in much less time, but I don't know how to fix it
+			yet..
+			-->
 			<id>REDUCED_JPA_TESTS</id>
 			<build>
 				<plugins>
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java
index 5e9ee66e604..3e9b0bb3fd3 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchNoFtTest.java
@@ -2326,17 +2326,6 @@ public class FhirResourceDaoR4SearchNoFtTest extends BaseJpaR4Test {
 		}
 	}
 
-	@Test
-	public void testSearchWithEmptySort() {
-		SearchParameterMap criteriaUrl = new SearchParameterMap();
-		DateRangeParam range = new DateRangeParam();
-		range.setLowerBound(new DateParam(ParamPrefixEnum.GREATERTHAN, 1000000));
-		range.setUpperBound(new DateParam(ParamPrefixEnum.LESSTHAN, 2000000));
-		criteriaUrl.setLastUpdated(range);
-		criteriaUrl.setSort(new SortSpec(Constants.PARAM_LASTUPDATED, SortOrderEnum.ASC));
-		IBundleProvider results = myObservationDao.search(criteriaUrl);
-		assertEquals(0, results.size().intValue());
-	}
 
 	@Test
 	public void testSearchWithIncludes() {
@@ -2986,265 +2975,6 @@ public class FhirResourceDaoR4SearchNoFtTest extends BaseJpaR4Test {
 		assertThat(toUnqualifiedVersionlessIds(result), containsInAnyOrder());
 	}
 
-	@Test
-	public void testSortOnId() throws Exception {
-		// Numeric ID
-		Patient p01 = new Patient();
-		p01.setActive(true);
-		p01.setGender(AdministrativeGender.MALE);
-		p01.addName().setFamily("B").addGiven("A");
-		String id1 = myPatientDao.create(p01).getId().toUnqualifiedVersionless().getValue();
-
-		// Numeric ID
-		Patient p02 = new Patient();
-		p02.setActive(true);
-		p02.setGender(AdministrativeGender.MALE);
-		p02.addName().setFamily("B").addGiven("B");
-		p02.addName().setFamily("Z").addGiven("Z");
-		String id2 = myPatientDao.create(p02).getId().toUnqualifiedVersionless().getValue();
-
-		// Forced ID
-		Patient pAB = new Patient();
-		pAB.setId("AB");
-		pAB.setActive(true);
-		pAB.setGender(AdministrativeGender.MALE);
-		pAB.addName().setFamily("A").addGiven("B");
-		myPatientDao.update(pAB);
-
-		// Forced ID
-		Patient pAA = new Patient();
-		pAA.setId("AA");
-		pAA.setActive(true);
-		pAA.setGender(AdministrativeGender.MALE);
-		pAA.addName().setFamily("A").addGiven("A");
-		myPatientDao.update(pAA);
-
-		SearchParameterMap map;
-		List<String> ids;
-
-		map = new SearchParameterMap();
-		map.setSort(new SortSpec("_id", SortOrderEnum.ASC));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		assertThat(ids, contains("Patient/AA", "Patient/AB", id1, id2));
-
-	}
-
-	@Test
-	public void testSortOnLastUpdated() throws Exception {
-		// Numeric ID
-		Patient p01 = new Patient();
-		p01.setActive(true);
-		p01.setGender(AdministrativeGender.MALE);
-		p01.addName().setFamily("B").addGiven("A");
-		String id1 = myPatientDao.create(p01).getId().toUnqualifiedVersionless().getValue();
-
-		Thread.sleep(10);
-
-		// Numeric ID
-		Patient p02 = new Patient();
-		p02.setActive(true);
-		p02.setGender(AdministrativeGender.MALE);
-		p02.addName().setFamily("B").addGiven("B");
-		p02.addName().setFamily("Z").addGiven("Z");
-		String id2 = myPatientDao.create(p02).getId().toUnqualifiedVersionless().getValue();
-
-		Thread.sleep(10);
-
-		// Forced ID
-		Patient pAB = new Patient();
-		pAB.setId("AB");
-		pAB.setActive(true);
-		pAB.setGender(AdministrativeGender.MALE);
-		pAB.addName().setFamily("A").addGiven("B");
-		myPatientDao.update(pAB);
-
-		Thread.sleep(10);
-
-		// Forced ID
-		Patient pAA = new Patient();
-		pAA.setId("AA");
-		pAA.setActive(true);
-		pAA.setGender(AdministrativeGender.MALE);
-		pAA.addName().setFamily("A").addGiven("A");
-		myPatientDao.update(pAA);
-
-		SearchParameterMap map;
-		List<String> ids;
-
-		map = new SearchParameterMap();
-		map.setSort(new SortSpec("_lastUpdated", SortOrderEnum.ASC));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		assertThat(ids, contains(id1, id2, "Patient/AB", "Patient/AA"));
-
-	}
-
-	@Test
-	public void testSortOnSearchParameterWhereAllResourcesHaveAValue() throws Exception {
-		Patient pBA = new Patient();
-		pBA.setId("BA");
-		pBA.setActive(true);
-		pBA.setGender(AdministrativeGender.MALE);
-		pBA.addName().setFamily("B").addGiven("A");
-		myPatientDao.update(pBA);
-
-		Patient pBB = new Patient();
-		pBB.setId("BB");
-		pBB.setActive(true);
-		pBB.setGender(AdministrativeGender.MALE);
-		pBB.addName().setFamily("B").addGiven("B");
-		pBB.addName().setFamily("Z").addGiven("Z");
-		myPatientDao.update(pBB);
-
-		Patient pAB = new Patient();
-		pAB.setId("AB");
-		pAB.setActive(true);
-		pAB.setGender(AdministrativeGender.MALE);
-		pAB.addName().setFamily("A").addGiven("B");
-		myPatientDao.update(pAB);
-
-		Patient pAA = new Patient();
-		pAA.setId("AA");
-		pAA.setActive(true);
-		pAA.setGender(AdministrativeGender.MALE);
-		pAA.addName().setFamily("A").addGiven("A");
-		myPatientDao.update(pAA);
-
-		SearchParameterMap map;
-		List<String> ids;
-
-		// No search param
-		map = new SearchParameterMap();
-		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
-
-		// Same SP as sort
-		map = new SearchParameterMap();
-		map.add(Patient.SP_ACTIVE, new TokenParam(null, "true"));
-		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
-
-		// Different SP from sort
-		map = new SearchParameterMap();
-		map.add(Patient.SP_GENDER, new TokenParam(null, "male"));
-		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
-
-		map = new SearchParameterMap();
-		map.setSort(new SortSpec("gender").setChain(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC))));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		ourLog.info("IDS: {}", ids);
-		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
-
-		map = new SearchParameterMap();
-		map.add(Patient.SP_ACTIVE, new TokenParam(null, "true"));
-		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
-	}
-
-	@SuppressWarnings("unused")
-	@Test
-	public void testSortOnSparselyPopulatedFields() {
-		IIdType pid1, pid2, pid3, pid4, pid5, pid6;
-		{
-			Patient p = new Patient();
-			p.setActive(true);
-			pid1 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
-		}
-		{
-			Patient p = new Patient();
-			p.addName().setFamily("A");
-			pid2 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
-		}
-		{
-			Patient p = new Patient();
-			p.addName().setFamily("B");
-			pid3 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
-		}
-		{
-			Patient p = new Patient();
-			p.addName().setFamily("B").addGiven("A");
-			pid4 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
-		}
-		{
-			Patient p = new Patient();
-			p.addName().setFamily("B").addGiven("B");
-			pid5 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
-		}
-
-		SearchParameterMap map;
-		List<IIdType> ids;
-
-		map = new SearchParameterMap();
-		map.setSort(new SortSpec(Patient.SP_FAMILY, SortOrderEnum.ASC).setChain(new SortSpec(Patient.SP_GIVEN, SortOrderEnum.ASC)));
-		ids = toUnqualifiedVersionlessIds(myPatientDao.search(map));
-		assertThat(ids, contains(pid2, pid4, pid5, pid3, pid1));
-		assertEquals(5, ids.size());
-
-	}
-
-	@Test
-	public void testSortOnSparselyPopulatedSearchParameter() throws Exception {
-		Patient pCA = new Patient();
-		pCA.setId("CA");
-		pCA.setActive(false);
-		pCA.getAddressFirstRep().addLine("A");
-		pCA.addName().setFamily("C").addGiven("A");
-		pCA.addName().setFamily("Z").addGiven("A");
-		myPatientDao.update(pCA);
-
-		Patient pBA = new Patient();
-		pBA.setId("BA");
-		pBA.setActive(true);
-		pBA.setGender(AdministrativeGender.MALE);
-		pBA.addName().setFamily("B").addGiven("A");
-		myPatientDao.update(pBA);
-
-		Patient pBB = new Patient();
-		pBB.setId("BB");
-		pBB.setActive(true);
-		pBB.setGender(AdministrativeGender.MALE);
-		pBB.addName().setFamily("B").addGiven("B");
-		myPatientDao.update(pBB);
-
-		Patient pAB = new Patient();
-		pAB.setId("AB");
-		pAB.setActive(true);
-		pAB.setGender(AdministrativeGender.MALE);
-		pAB.addName().setFamily("A").addGiven("B");
-		myPatientDao.update(pAB);
-
-		Patient pAA = new Patient();
-		pAA.setId("AA");
-		pAA.setActive(true);
-		pAA.setGender(AdministrativeGender.MALE);
-		pAA.addName().setFamily("A").addGiven("A");
-		myPatientDao.update(pAA);
-
-		SearchParameterMap map;
-		List<String> ids;
-
-		map = new SearchParameterMap();
-		map.setSort(new SortSpec("gender"));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		ourLog.info("IDS: {}", ids);
-		assertThat(ids, containsInAnyOrder("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB", "Patient/CA"));
-
-		map = new SearchParameterMap();
-		map.setSort(new SortSpec("gender").setChain(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC))));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		ourLog.info("IDS: {}", ids);
-		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB", "Patient/CA"));
-
-		map = new SearchParameterMap();
-		map.add(Patient.SP_ACTIVE, new TokenParam(null, "true"));
-		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
-		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
-		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
-	}
 
 	private String toStringMultiline(List<?> theResults) {
 		StringBuilder b = new StringBuilder();
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java
new file mode 100644
index 00000000000..3336da449a8
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SortTest.java
@@ -0,0 +1,312 @@
+package ca.uhn.fhir.jpa.dao.r4;
+
+import ca.uhn.fhir.jpa.dao.SearchParameterMap;
+import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.api.SortOrderEnum;
+import ca.uhn.fhir.rest.api.SortSpec;
+import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.param.DateParam;
+import ca.uhn.fhir.rest.param.DateRangeParam;
+import ca.uhn.fhir.rest.param.ParamPrefixEnum;
+import ca.uhn.fhir.rest.param.TokenParam;
+import ca.uhn.fhir.util.TestUtil;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.r4.model.Enumerations.AdministrativeGender;
+import org.hl7.fhir.r4.model.Patient;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.*;
+
+@SuppressWarnings({"unchecked", "deprecation"})
+public class FhirResourceDaoR4SortTest extends BaseJpaR4Test {
+
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoR4SortTest.class);
+
+	@After
+	public final void after() {
+	}
+
+	@Test
+	public void testSearchWithEmptySort() {
+		SearchParameterMap criteriaUrl = new SearchParameterMap();
+		DateRangeParam range = new DateRangeParam();
+		range.setLowerBound(new DateParam(ParamPrefixEnum.GREATERTHAN, 1000000));
+		range.setUpperBound(new DateParam(ParamPrefixEnum.LESSTHAN, 2000000));
+		criteriaUrl.setLastUpdated(range);
+		criteriaUrl.setSort(new SortSpec(Constants.PARAM_LASTUPDATED, SortOrderEnum.ASC));
+		IBundleProvider results = myObservationDao.search(criteriaUrl);
+		assertEquals(0, results.size().intValue());
+	}
+
+	@Test
+	public void testSortOnId() throws Exception {
+		// Numeric ID
+		Patient p01 = new Patient();
+		p01.setActive(true);
+		p01.setGender(AdministrativeGender.MALE);
+		p01.addName().setFamily("B").addGiven("A");
+		String id1 = myPatientDao.create(p01).getId().toUnqualifiedVersionless().getValue();
+
+		// Numeric ID
+		Patient p02 = new Patient();
+		p02.setActive(true);
+		p02.setGender(AdministrativeGender.MALE);
+		p02.addName().setFamily("B").addGiven("B");
+		p02.addName().setFamily("Z").addGiven("Z");
+		String id2 = myPatientDao.create(p02).getId().toUnqualifiedVersionless().getValue();
+
+		// Forced ID
+		Patient pAB = new Patient();
+		pAB.setId("AB");
+		pAB.setActive(true);
+		pAB.setGender(AdministrativeGender.MALE);
+		pAB.addName().setFamily("A").addGiven("B");
+		myPatientDao.update(pAB);
+
+		// Forced ID
+		Patient pAA = new Patient();
+		pAA.setId("AA");
+		pAA.setActive(true);
+		pAA.setGender(AdministrativeGender.MALE);
+		pAA.addName().setFamily("A").addGiven("A");
+		myPatientDao.update(pAA);
+
+		SearchParameterMap map;
+		List<String> ids;
+
+		map = new SearchParameterMap();
+		map.setSort(new SortSpec("_id", SortOrderEnum.ASC));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		assertThat(ids, contains("Patient/AA", "Patient/AB", id1, id2));
+
+	}
+
+	@Test
+	public void testSortOnLastUpdated() throws Exception {
+		// Numeric ID
+		Patient p01 = new Patient();
+		p01.setActive(true);
+		p01.setGender(AdministrativeGender.MALE);
+		p01.addName().setFamily("B").addGiven("A");
+		String id1 = myPatientDao.create(p01).getId().toUnqualifiedVersionless().getValue();
+
+		Thread.sleep(10);
+
+		// Numeric ID
+		Patient p02 = new Patient();
+		p02.setActive(true);
+		p02.setGender(AdministrativeGender.MALE);
+		p02.addName().setFamily("B").addGiven("B");
+		p02.addName().setFamily("Z").addGiven("Z");
+		String id2 = myPatientDao.create(p02).getId().toUnqualifiedVersionless().getValue();
+
+		Thread.sleep(10);
+
+		// Forced ID
+		Patient pAB = new Patient();
+		pAB.setId("AB");
+		pAB.setActive(true);
+		pAB.setGender(AdministrativeGender.MALE);
+		pAB.addName().setFamily("A").addGiven("B");
+		myPatientDao.update(pAB);
+
+		Thread.sleep(10);
+
+		// Forced ID
+		Patient pAA = new Patient();
+		pAA.setId("AA");
+		pAA.setActive(true);
+		pAA.setGender(AdministrativeGender.MALE);
+		pAA.addName().setFamily("A").addGiven("A");
+		myPatientDao.update(pAA);
+
+		SearchParameterMap map;
+		List<String> ids;
+
+		map = new SearchParameterMap();
+		map.setSort(new SortSpec("_lastUpdated", SortOrderEnum.ASC));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		assertThat(ids, contains(id1, id2, "Patient/AB", "Patient/AA"));
+
+	}
+
+	@Test
+	public void testSortOnSearchParameterWhereAllResourcesHaveAValue() throws Exception {
+		Patient pBA = new Patient();
+		pBA.setId("BA");
+		pBA.setActive(true);
+		pBA.setGender(AdministrativeGender.MALE);
+		pBA.addName().setFamily("B").addGiven("A");
+		myPatientDao.update(pBA);
+
+		Patient pBB = new Patient();
+		pBB.setId("BB");
+		pBB.setActive(true);
+		pBB.setGender(AdministrativeGender.MALE);
+		pBB.addName().setFamily("B").addGiven("B");
+		pBB.addName().setFamily("Z").addGiven("Z");
+		myPatientDao.update(pBB);
+
+		Patient pAB = new Patient();
+		pAB.setId("AB");
+		pAB.setActive(true);
+		pAB.setGender(AdministrativeGender.MALE);
+		pAB.addName().setFamily("A").addGiven("B");
+		myPatientDao.update(pAB);
+
+		Patient pAA = new Patient();
+		pAA.setId("AA");
+		pAA.setActive(true);
+		pAA.setGender(AdministrativeGender.MALE);
+		pAA.addName().setFamily("A").addGiven("A");
+		myPatientDao.update(pAA);
+
+		SearchParameterMap map;
+		List<String> ids;
+
+		// No search param
+		map = new SearchParameterMap();
+		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
+
+		// Same SP as sort
+		map = new SearchParameterMap();
+		map.add(Patient.SP_ACTIVE, new TokenParam(null, "true"));
+		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
+
+		// Different SP from sort
+		map = new SearchParameterMap();
+		map.add(Patient.SP_GENDER, new TokenParam(null, "male"));
+		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
+
+		map = new SearchParameterMap();
+		map.setSort(new SortSpec("gender").setChain(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC))));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		ourLog.info("IDS: {}", ids);
+		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
+
+		map = new SearchParameterMap();
+		map.add(Patient.SP_ACTIVE, new TokenParam(null, "true"));
+		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
+	}
+
+	@SuppressWarnings("unused")
+	@Test
+	public void testSortOnSparselyPopulatedFields() {
+		IIdType pid1, pid2, pid3, pid4, pid5, pid6;
+		{
+			Patient p = new Patient();
+			p.setActive(true);
+			pid1 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
+		}
+		{
+			Patient p = new Patient();
+			p.addName().setFamily("A");
+			pid2 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
+		}
+		{
+			Patient p = new Patient();
+			p.addName().setFamily("B");
+			pid3 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
+		}
+		{
+			Patient p = new Patient();
+			p.addName().setFamily("B").addGiven("A");
+			pid4 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
+		}
+		{
+			Patient p = new Patient();
+			p.addName().setFamily("B").addGiven("B");
+			pid5 = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless();
+		}
+
+		SearchParameterMap map;
+		List<IIdType> ids;
+
+		map = new SearchParameterMap();
+		map.setSort(new SortSpec(Patient.SP_FAMILY, SortOrderEnum.ASC).setChain(new SortSpec(Patient.SP_GIVEN, SortOrderEnum.ASC)));
+		ids = toUnqualifiedVersionlessIds(myPatientDao.search(map));
+		assertThat(ids, contains(pid2, pid4, pid5, pid3, pid1));
+		assertEquals(5, ids.size());
+
+	}
+
+	@Test
+	public void testSortOnSparselyPopulatedSearchParameter() throws Exception {
+		Patient pCA = new Patient();
+		pCA.setId("CA");
+		pCA.setActive(false);
+		pCA.getAddressFirstRep().addLine("A");
+		pCA.addName().setFamily("C").addGiven("A");
+		pCA.addName().setFamily("Z").addGiven("A");
+		myPatientDao.update(pCA);
+
+		Patient pBA = new Patient();
+		pBA.setId("BA");
+		pBA.setActive(true);
+		pBA.setGender(AdministrativeGender.MALE);
+		pBA.addName().setFamily("B").addGiven("A");
+		myPatientDao.update(pBA);
+
+		Patient pBB = new Patient();
+		pBB.setId("BB");
+		pBB.setActive(true);
+		pBB.setGender(AdministrativeGender.MALE);
+		pBB.addName().setFamily("B").addGiven("B");
+		myPatientDao.update(pBB);
+
+		Patient pAB = new Patient();
+		pAB.setId("AB");
+		pAB.setActive(true);
+		pAB.setGender(AdministrativeGender.MALE);
+		pAB.addName().setFamily("A").addGiven("B");
+		myPatientDao.update(pAB);
+
+		Patient pAA = new Patient();
+		pAA.setId("AA");
+		pAA.setActive(true);
+		pAA.setGender(AdministrativeGender.MALE);
+		pAA.addName().setFamily("A").addGiven("A");
+		myPatientDao.update(pAA);
+
+		SearchParameterMap map;
+		List<String> ids;
+
+		map = new SearchParameterMap();
+		map.setSort(new SortSpec("gender"));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		ourLog.info("IDS: {}", ids);
+		assertThat(ids, containsInAnyOrder("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB", "Patient/CA"));
+
+		map = new SearchParameterMap();
+		map.setSort(new SortSpec("gender").setChain(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC))));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		ourLog.info("IDS: {}", ids);
+		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB", "Patient/CA"));
+
+		map = new SearchParameterMap();
+		map.add(Patient.SP_ACTIVE, new TokenParam(null, "true"));
+		map.setSort(new SortSpec("family", SortOrderEnum.ASC).setChain(new SortSpec("given", SortOrderEnum.ASC)));
+		ids = toUnqualifiedVersionlessIdValues(myPatientDao.search(map));
+		assertThat(ids, contains("Patient/AA", "Patient/AB", "Patient/BA", "Patient/BB"));
+	}
+
+	@AfterClass
+	public static void afterClassClearContext() {
+		TestUtil.clearAllStaticFieldsForUnitTest();
+	}
+
+}