diff --git a/server/datastore/mysql/cron_stats_test.go b/server/datastore/mysql/cron_stats_test.go
index 7d6c68ad3c..07d7a91931 100644
--- a/server/datastore/mysql/cron_stats_test.go
+++ b/server/datastore/mysql/cron_stats_test.go
@@ -79,7 +79,7 @@ func TestGetInsertUpdateCronStats(t *testing.T) {
 	}
 
 	var updatedResults []fleet.CronStats
-	err := sqlx.SelectContext(ctx, ds.reader, &updatedResults, "SELECT * FROM cron_stats")
+	err := sqlx.SelectContext(ctx, ds.reader, &updatedResults, "SELECT * FROM cron_stats ORDER BY id")
 	require.NoError(t, err)
 	require.Len(t, updatedResults, len(cases))
 	for i, r := range updatedResults {
@@ -154,7 +154,7 @@ func TestCleanupCronStats(t *testing.T) {
 		},
 		{
 			createdAt:               now.Add(-2 * time.Hour),
-			status:                  fleet.CronStatsStatusPending,
+			status:                  fleet.CronStatsStatusExpired,
 			shouldCleanupMaxPending: false,
 			shouldCleanupMaxAge:     false,
 		},
@@ -199,7 +199,9 @@ func TestCleanupCronStats(t *testing.T) {
 		require.Equal(t, cases[i].status, s.Status)
 	}
 
-	ds.CleanupCronStats(ctx)
+	err = ds.CleanupCronStats(ctx)
+	require.NoError(t, err)
+
 	stats = []fleet.CronStats{}
 	err = sqlx.SelectContext(ctx, ds.reader, &stats, `SELECT * FROM cron_stats ORDER BY id`)
 	require.NoError(t, err)
diff --git a/server/service/schedule/schedule_test.go b/server/service/schedule/schedule_test.go
index f4b8f0387a..bef6b244bb 100644
--- a/server/service/schedule/schedule_test.go
+++ b/server/service/schedule/schedule_test.go
@@ -417,8 +417,7 @@ func TestScheduleHoldLock(t *testing.T) {
 		require.Equal(t, 4, ml.GetLockCount())
 		require.WithinRange(t, time.Now(),
 			start.Add(3*schedInterval).Add(jobDuration),
-			start.Add(3*schedInterval).Add(jobDuration).Add(1*time.Second),
-		)
+			start.Add(3*schedInterval).Add(jobDuration).Add(2*time.Second))
 	}
 }