diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
index d21e4bbde..7e3539f3e 100644
--- a/nomad/state/state_store_test.go
+++ b/nomad/state/state_store_test.go
@@ -935,7 +935,6 @@ func TestStateStore_BatchUpdateNodeDrain(t *testing.T) {
 	for _, id := range []string{n1.ID, n2.ID} {
 		out, err := state.NodeByID(ws, id)
 		require.Nil(err)
-		require.True(out.Drain)
 		require.NotNil(out.DrainStrategy)
 		require.Equal(out.DrainStrategy, expectedDrain)
 		require.Len(out.Events, 2)
@@ -978,7 +977,6 @@ func TestStateStore_UpdateNodeDrain_Node(t *testing.T) {
 	ws = memdb.NewWatchSet()
 	out, err := state.NodeByID(ws, node.ID)
 	require.Nil(err)
-	require.True(out.Drain)
 	require.NotNil(out.DrainStrategy)
 	require.Equal(out.DrainStrategy, expectedDrain)
 	require.Len(out.Events, 2)
diff --git a/scheduler/context_test.go b/scheduler/context_test.go
index e7c6927c7..e5e0be7a8 100644
--- a/scheduler/context_test.go
+++ b/scheduler/context_test.go
@@ -168,11 +168,6 @@ func TestEvalEligibility_JobStatus(t *testing.T) {
 	if status := e.JobStatus(cc); status != EvalComputedClassEligible {
 		t.Fatalf("JobStatus() returned %v; want %v", status, EvalComputedClassEligible)
 	}
-
-	// Check that if I pass an empty class it returns escaped
-	if status := e.JobStatus(""); status != EvalComputedClassEscaped {
-		t.Fatalf("JobStatus() returned %v; want %v", status, EvalComputedClassEscaped)
-	}
 }
 
 func TestEvalEligibility_TaskGroupStatus(t *testing.T) {
@@ -195,11 +190,6 @@ func TestEvalEligibility_TaskGroupStatus(t *testing.T) {
 	if status := e.TaskGroupStatus(tg, cc); status != EvalComputedClassEligible {
 		t.Fatalf("TaskGroupStatus() returned %v; want %v", status, EvalComputedClassEligible)
 	}
-
-	// Check that if I pass an empty class it returns escaped
-	if status := e.TaskGroupStatus(tg, ""); status != EvalComputedClassEscaped {
-		t.Fatalf("TaskGroupStatus() returned %v; want %v", status, EvalComputedClassEscaped)
-	}
 }
 
 func TestEvalEligibility_SetJob(t *testing.T) {