diff --git a/Tests/Realm.Tests/Sync/SessionTests.cs b/Tests/Realm.Tests/Sync/SessionTests.cs
index 09ca2d9146..f4470147c8 100644
--- a/Tests/Realm.Tests/Sync/SessionTests.cs
+++ b/Tests/Realm.Tests/Sync/SessionTests.cs
@@ -1328,7 +1328,7 @@ public void Session_WaitForUpload_CanBeCancelled()
 
                 sw.Stop();
 
-                Assert.That(sw.ElapsedMilliseconds, Is.LessThan(5));
+                Assert.That(sw.ElapsedMilliseconds, Is.LessThan(30));
             });
         }
 
@@ -1377,7 +1377,7 @@ public void Session_WaitForDownload_CanBeCancelled()
 
                 sw.Stop();
 
-                Assert.That(sw.ElapsedMilliseconds, Is.LessThan(5));
+                Assert.That(sw.ElapsedMilliseconds, Is.LessThan(30));
                 Assert.That(readerRealm.All<SyncAllTypesObject>().Count(), Is.Zero);
 
                 await GetSession(readerRealm).WaitForDownloadAsync();
diff --git a/Tests/Realm.Tests/Sync/StaticQueriesTests.cs b/Tests/Realm.Tests/Sync/StaticQueriesTests.cs
index 6e8fd2cb7c..0879cd696e 100644
--- a/Tests/Realm.Tests/Sync/StaticQueriesTests.cs
+++ b/Tests/Realm.Tests/Sync/StaticQueriesTests.cs
@@ -542,7 +542,7 @@ public void RealmObjectAPI_Links_AtlasToRealm(TestCaseData<LinksObject> testCase
                 var linkObjs = await realm.All<LinksObject>().SubscribeAsync();
 
                 await realm.SyncSession.WaitForDownloadAsync();
-                await linkObjs.WaitForEventAsync((sender, _) => sender.Count >= totalCount);
+                await linkObjs.WaitForEventAsync((sender, _) => sender.Count >= totalCount && realm.Find<LinksObject>(obj.Id) != null);
 
                 var linkObj = realm.Find<LinksObject>(obj.Id);
 
@@ -752,7 +752,7 @@ public void RealmObjectAPI_RealmValueLinks_AtlasToRealm(TestCaseData<RealmValueO
                 var realmObjs = await realm.All<RealmValueObject>().SubscribeAsync();
 
                 await intObjs.WaitForEventAsync((sender, _) => sender.Count >= totalCount);
-                await realmObjs.WaitForEventAsync((sender, _) => sender.Count >= 1);
+                await realmObjs.WaitForEventAsync((sender, _) => sender.Count == 1 && realm.Find<RealmValueObject>(obj.Id) != null);
 
                 var realmValObj = realm.Find<RealmValueObject>(obj.Id);
 
@@ -1257,7 +1257,7 @@ public void RealmObjectAPI_MissingField_GetsDefaultValueWhenDeserialized()
 
             SyncConfigurationBase config = appConfigType == AppConfigType.FlexibleSync ? GetFLXIntegrationConfig(user) : GetIntegrationConfig(user);
 
-            using var realm = await GetRealmAsync(config);
+            using var realm = await GetRealmAsync(config, true);
             var client = user.GetMongoClient(ServiceName);
             var collection = client.GetCollection<T>();
             await collection.DeleteManyAsync(new object());
@@ -1272,7 +1272,7 @@ public void RealmObjectAPI_MissingField_GetsDefaultValueWhenDeserialized()
 
             SyncConfigurationBase config = appConfigType == AppConfigType.FlexibleSync ? GetFLXIntegrationConfig(user) : GetIntegrationConfig(user);
 
-            using var realm = await GetRealmAsync(config);
+            using var realm = await GetRealmAsync(config, true);
             var client = user.GetMongoClient(ServiceName);
             var db = client.GetDatabase(SyncTestHelpers.SyncMongoDBName(appConfigType));
 
diff --git a/Tests/Realm.Tests/Sync/UserManagementTests.cs b/Tests/Realm.Tests/Sync/UserManagementTests.cs
index d959a6b514..8a06bd77f3 100644
--- a/Tests/Realm.Tests/Sync/UserManagementTests.cs
+++ b/Tests/Realm.Tests/Sync/UserManagementTests.cs
@@ -1166,11 +1166,11 @@ public void UserCustomDataChange_RaisesChanged()
 
                 await tcs.Task;
 
-                tcs = new();
-
                 // Unsubscribe and verify that it no longer raises user changed
                 user.Changed -= OnUserChanged;
 
+                tcs = new();
+
                 var filter = BsonDocument.Parse(@"{
                     user_id: { $eq: """ + user.Id + @""" }
                 }");