diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
index f6d26addaa..08107e01eb 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using osu.Game.Rulesets.Catch.Mods;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -12,9 +13,10 @@ public class TestSceneDrawableHitObjectsHidden : TestSceneDrawableHitObjects
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(CatchModHidden) }).ToList();
 
-        public TestSceneDrawableHitObjectsHidden()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             Mods.Value = new[] { new CatchModHidden() };
-        }
+        });
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
index 55c6b22146..eaba82a469 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleHidden.cs
@@ -14,9 +14,10 @@ public class TestSceneHitCircleHidden : TestSceneHitCircle
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestSceneHitCircleHidden()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             Mods.Value = new[] { new OsuModHidden() };
-        }
+        });
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
index 2a9c1d167b..a1795fb877 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderHidden.cs
@@ -14,9 +14,10 @@ public class TestSceneSliderHidden : TestSceneSlider
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestSceneSliderHidden()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             Mods.Value = new[] { new OsuModHidden() };
-        }
+        });
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
index a0ab1908d6..2976d4fdce 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerHidden.cs
@@ -14,9 +14,10 @@ public class TestSceneSpinnerHidden : TestSceneSpinner
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestSceneSpinnerHidden()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             Mods.Value = new[] { new OsuModHidden() };
-        }
+        });
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index be50200e1c..8cf2d29906 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -124,7 +124,7 @@ public void TestRulesetChanges()
             var easierMods = instance.GetModsFor(ModType.DifficultyReduction);
             var noFailMod = easierMods.FirstOrDefault(m => m is OsuModNoFail);
 
-            AddStep("set mods externally", () => { modDisplay.Current.Value = new[] { noFailMod }; });
+            AddStep("set mods externally", () => { Mods.Value = new[] { noFailMod }; });
 
             changeRuleset(rulesetOsu);