diff --git a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
index 7c8a61b231..98e6cd514b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs
@@ -84,6 +84,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public virtual void SetUpSteps()
         {
+            AddStep("reset counts", () => spectatorClient.Invocations.Clear());
+
             AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = new APIUser
             {
                 Id = 1,
@@ -111,6 +113,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
 
             AddUntilStep("wait for load", () => Leaderboard.IsLoaded);
+
+            AddStep("check watch requests were sent", () =>
+            {
+                foreach (var user in MultiplayerUsers)
+                    spectatorClient.Verify(s => s.WatchUser(user.UserID), Times.Once);
+            });
         }
 
         [Test]
@@ -131,6 +139,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 MultiplayerUsers.RemoveAt(0);
                 return false;
             });
+
+            AddStep("check stop watching requests were sent", () =>
+            {
+                foreach (var user in MultiplayerUsers)
+                    spectatorClient.Verify(s => s.StopWatchingUser(user.UserID), Times.Once);
+            });
         }
 
         [Test]
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 138e8ac7d6..78beda6298 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Online.Spectator
             });
         }
 
-        public void WatchUser(int userId)
+        public virtual void WatchUser(int userId)
         {
             Debug.Assert(ThreadSafety.IsUpdateThread);