diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index ba2faacb7e..916a94c9c4 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -70,9 +70,11 @@ public sealed partial class TestPair
         if (settings.ShouldBeConnected)
         {
             Client.SetConnectTarget(Server);
+            await Client.WaitIdleAsync();
+            var netMgr = Client.ResolveDependency<IClientNetManager>();
+
             await Client.WaitPost(() =>
             {
-                var netMgr = IoCManager.Resolve<IClientNetManager>();
                 if (!netMgr.IsConnected)
                 {
                     netMgr.ClientConnect(null!, 0, null!);
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index c9788b80a6..3b7ecf0135 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -341,7 +341,6 @@ public sealed partial class MindTests
         var playerMan = server.ResolveDependency<IPlayerManager>();
 
         var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
-        var ghostSystem = entMan.EntitySysManager.GetEntitySystem<GhostSystem>();
 
         EntityUid entity = default!;
         EntityUid mindId = default!;
@@ -381,7 +380,7 @@ public sealed partial class MindTests
 
             mob = entMan.SpawnEntity(null, new MapCoordinates());
 
-            MakeSentientCommand.MakeSentient(mob, IoCManager.Resolve<IEntityManager>());
+            MakeSentientCommand.MakeSentient(mob, entMan);
             mobMindId = mindSystem.CreateMind(player.UserId, "Mindy McThinker the Second");
             mobMind = entMan.GetComponent<MindComponent>(mobMindId);