diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
index 9f34931f54..a4a4f351ec 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
@@ -255,7 +255,15 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             prepareTestAPI(true);
 
-            createPlayerTest(false, createRuleset: () => new OsuRuleset { RulesetInfo = { OnlineID = rulesetId ?? -1 } });
+            createPlayerTest(false, createRuleset: () => new OsuRuleset
+            {
+                RulesetInfo =
+                {
+                    Name = "custom",
+                    ShortName = $"custom{rulesetId}",
+                    OnlineID = rulesetId ?? -1
+                }
+            });
 
             AddUntilStep("wait for token request", () => Player.TokenCreationRequested);
 
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index 5d5cbe6328..2e2ec5c024 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -47,14 +47,25 @@ namespace osu.Game.Rulesets
 
         public bool Available { get; set; }
 
-        public bool Equals(RulesetInfo? other) => other != null
-                                                  && OnlineID == other.OnlineID
-                                                  && Available == other.Available
-                                                  && Name == other.Name
-                                                  && InstantiationInfo == other.InstantiationInfo;
+        public bool Equals(RulesetInfo? other)
+        {
+            if (ReferenceEquals(this, other)) return true;
+            if (other == null) return false;
+
+            return ShortName == other.ShortName;
+        }
 
         public bool Equals(IRulesetInfo? other) => other is RulesetInfo b && Equals(b);
 
+        public override int GetHashCode()
+        {
+            // Importantly, ignore the underlying realm hash code, as it will usually not match.
+            var hashCode = new HashCode();
+            // ReSharper disable once NonReadonlyMemberInGetHashCode
+            hashCode.Add(ShortName);
+            return hashCode.ToHashCode();
+        }
+
         public override string ToString() => Name;
 
         public RulesetInfo Clone() => new RulesetInfo