diff --git a/nomad/core_sched_test.go b/nomad/core_sched_test.go
index 6ba4a8816..6373bf3d7 100644
--- a/nomad/core_sched_test.go
+++ b/nomad/core_sched_test.go
@@ -29,7 +29,14 @@ func TestCoreScheduler_EvalGC(t *testing.T) {
 	alloc.EvalID = eval.ID
 	alloc.DesiredStatus = structs.AllocDesiredStatusStop
 	alloc.JobID = eval.JobID
-	err = state.UpsertAllocs(1001, []*structs.Allocation{alloc})
+
+	// Insert "lost" alloc
+	alloc2 := mock.Alloc()
+	alloc2.EvalID = eval.ID
+	alloc2.DesiredStatus = structs.AllocDesiredStatusRun
+	alloc2.ClientStatus = structs.AllocClientStatusLost
+	alloc2.JobID = eval.JobID
+	err = state.UpsertAllocs(1001, []*structs.Allocation{alloc, alloc2})
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -68,6 +75,14 @@ func TestCoreScheduler_EvalGC(t *testing.T) {
 	if outA != nil {
 		t.Fatalf("bad: %v", outA)
 	}
+
+	outA2, err := state.AllocByID(alloc2.ID)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if outA2 != nil {
+		t.Fatalf("bad: %v", outA2)
+	}
 }
 
 // An EvalGC should never reap a batch job
@@ -101,7 +116,15 @@ func TestCoreScheduler_EvalGC_Batch(t *testing.T) {
 	alloc.JobID = job.ID
 	alloc.EvalID = eval.ID
 	alloc.DesiredStatus = structs.AllocDesiredStatusStop
-	err = state.UpsertAllocs(1002, []*structs.Allocation{alloc})
+
+	// Insert "lost" alloc
+	alloc2 := mock.Alloc()
+	alloc2.JobID = job.ID
+	alloc2.EvalID = eval.ID
+	alloc2.DesiredStatus = structs.AllocDesiredStatusRun
+	alloc2.ClientStatus = structs.AllocClientStatusLost
+
+	err = state.UpsertAllocs(1002, []*structs.Allocation{alloc, alloc2})
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -141,6 +164,14 @@ func TestCoreScheduler_EvalGC_Batch(t *testing.T) {
 		t.Fatalf("bad: %v", outA)
 	}
 
+	outA2, err := state.AllocByID(alloc2.ID)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if outA2 == nil {
+		t.Fatalf("bad: %v", outA2)
+	}
+
 	outB, err := state.JobByID(job.ID)
 	if err != nil {
 		t.Fatalf("err: %v", err)
@@ -170,16 +201,24 @@ func TestCoreScheduler_EvalGC_Partial(t *testing.T) {
 	alloc.EvalID = eval.ID
 	alloc.DesiredStatus = structs.AllocDesiredStatusStop
 	state.UpsertJobSummary(1001, mock.JobSummary(alloc.JobID))
-	err = state.UpsertAllocs(1002, []*structs.Allocation{alloc})
+
+	// Insert "lost" alloc
+	alloc2 := mock.Alloc()
+	alloc2.JobID = alloc.JobID
+	alloc2.EvalID = eval.ID
+	alloc2.DesiredStatus = structs.AllocDesiredStatusRun
+	alloc2.ClientStatus = structs.AllocClientStatusLost
+
+	err = state.UpsertAllocs(1002, []*structs.Allocation{alloc, alloc2})
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
 	// Insert "running" alloc
-	alloc2 := mock.Alloc()
-	alloc2.EvalID = eval.ID
-	state.UpsertJobSummary(1003, mock.JobSummary(alloc2.JobID))
-	err = state.UpsertAllocs(1004, []*structs.Allocation{alloc2})
+	alloc3 := mock.Alloc()
+	alloc3.EvalID = eval.ID
+	state.UpsertJobSummary(1003, mock.JobSummary(alloc3.JobID))
+	err = state.UpsertAllocs(1004, []*structs.Allocation{alloc3})
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -211,7 +250,7 @@ func TestCoreScheduler_EvalGC_Partial(t *testing.T) {
 		t.Fatalf("bad: %v", out)
 	}
 
-	outA, err := state.AllocByID(alloc2.ID)
+	outA, err := state.AllocByID(alloc3.ID)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -227,6 +266,14 @@ func TestCoreScheduler_EvalGC_Partial(t *testing.T) {
 	if outB != nil {
 		t.Fatalf("bad: %v", outB)
 	}
+
+	outC, err := state.AllocByID(alloc2.ID)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if outC != nil {
+		t.Fatalf("bad: %v", outC)
+	}
 }
 
 func TestCoreScheduler_EvalGC_Force(t *testing.T) {
diff --git a/scheduler/generic_sched_test.go b/scheduler/generic_sched_test.go
index 46d7ee7f8..f35a7b0ed 100644
--- a/scheduler/generic_sched_test.go
+++ b/scheduler/generic_sched_test.go
@@ -1253,6 +1253,15 @@ func TestServiceSched_NodeDown(t *testing.T) {
 		alloc.Name = fmt.Sprintf("my-job.web[%d]", i)
 		allocs = append(allocs, alloc)
 	}
+
+	// Cover each terminal case and ensure it doesn't change to lost
+	allocs[7].DesiredStatus = structs.AllocDesiredStatusRun
+	allocs[7].ClientStatus = structs.AllocClientStatusLost
+	allocs[8].DesiredStatus = structs.AllocDesiredStatusRun
+	allocs[8].ClientStatus = structs.AllocClientStatusFailed
+	allocs[9].DesiredStatus = structs.AllocDesiredStatusRun
+	allocs[9].ClientStatus = structs.AllocClientStatusComplete
+
 	noErr(t, h.State.UpsertAllocs(h.NextIndex(), allocs))
 
 	// Mark some allocs as running
@@ -1286,8 +1295,8 @@ func TestServiceSched_NodeDown(t *testing.T) {
 	}
 	plan := h.Plans[0]
 
-	// Test the scheduler marked all allocations as lost.
-	if len(plan.NodeUpdate[node.ID]) != len(allocs) {
+	// Test the scheduler marked all non-terminal allocations as lost
+	if len(plan.NodeUpdate[node.ID]) != 7 {
 		t.Fatalf("bad: %#v", plan)
 	}