diff --git a/server/service/integration_mdm_lifecycle_test.go b/server/service/integration_mdm_lifecycle_test.go
index 27c1458c4075..6aa3002ad19d 100644
--- a/server/service/integration_mdm_lifecycle_test.go
+++ b/server/service/integration_mdm_lifecycle_test.go
@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/fleetdm/fleet/v4/pkg/mdm/mdmtest"
 	"github.com/fleetdm/fleet/v4/server/config"
@@ -803,21 +804,30 @@ func (s *integrationMDMTestSuite) TestLifecycleSCEPCertExpiration() {
 	require.NoError(t, migratedDevice.Enroll())
 
 	// no new commands are enqueued right after enrollment
-	cmd, err = manualEnrolledDevice.Idle()
-	require.NoError(t, err)
-	require.Nil(t, cmd)
 
-	cmd, err = automaticEnrolledDevice.Idle()
-	require.NoError(t, err)
-	require.Nil(t, cmd)
+	require.Eventually(t, func() bool {
+		cmd, err = manualEnrolledDevice.Idle()
+		require.NoError(t, err)
+		return cmd == nil
+	}, 1*time.Minute, 2*time.Second)
 
-	cmd, err = automaticEnrolledDeviceWithRef.Idle()
-	require.NoError(t, err)
-	require.Nil(t, cmd)
+	require.Eventually(t, func() bool {
+		cmd, err = automaticEnrolledDevice.Idle()
+		require.NoError(t, err)
+		return cmd == nil
+	}, 1*time.Minute, 2*time.Second)
 
-	cmd, err = migratedDevice.Idle()
-	require.NoError(t, err)
-	require.Nil(t, cmd)
+	require.Eventually(t, func() bool {
+		cmd, err = automaticEnrolledDeviceWithRef.Idle()
+		require.NoError(t, err)
+		return cmd == nil
+	}, 1*time.Minute, 2*time.Second)
+
+	require.Eventually(t, func() bool {
+		cmd, err = migratedDevice.Idle()
+		require.NoError(t, err)
+		return cmd == nil
+	}, 1*time.Minute, 2*time.Second)
 
 	// handle the case of a host being deleted, see https://github.com/fleetdm/fleet/issues/19149
 	expireCerts()
diff --git a/server/service/integration_mdm_test.go b/server/service/integration_mdm_test.go
index ce134a2bd5fe..8da89728c1cb 100644
--- a/server/service/integration_mdm_test.go
+++ b/server/service/integration_mdm_test.go
@@ -8816,7 +8816,9 @@ func (s *integrationMDMTestSuite) TestLockUnlockWipeMacOS() {
 	cmd, err := mdmClient.Idle()
 	require.NoError(t, err)
 	require.NotNil(t, cmd)
-	require.Equal(t, "DeviceLock", cmd.Command.RequestType)
+	require.Eventually(t, func() bool {
+		return cmd.Command.RequestType == "DeviceLock"
+	}, 1*time.Minute, 2*time.Second)
 	_, err = mdmClient.Acknowledge(cmd.CommandUUID)
 	require.NoError(t, err)