diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs
index c8f7da1aae..d185293093 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => Player.ScoreProcessor.Combo.Value == 2,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index a161615579..6114c9ce6f 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
             Mod = new CatchModRelax(),
             Autoplay = false,
             PassCondition = passCondition,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index 825e8c697c..1f32a4531b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             CreateModTest(new ModTestData
             {
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs
index f653f209c1..4871f5b585 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = new ManiaBeatmap(new StageDefinition(1))
+                Beatmap = () => new ManiaBeatmap(new StageDefinition(1))
                 {
                     HitObjects = new List<ManiaHitObject>
                     {
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index 975e43ec08..a492c53456 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
                                   && Precision.AlmostEquals(Player.ScoreProcessor.Accuracy.Value, 0.9836, 0.01)
                                   && Player.ScoreProcessor.TotalScore.Value == 946_049,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
                 Difficulty = { OverallDifficulty = 10 },
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
                                       && Player.ScoreProcessor.Accuracy.Value == 1
                                       && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_000 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
                     Difficulty = { OverallDifficulty = 10 },
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
index 9620897983..c425bb05c7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModFadeIn.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = new ManiaModHidden(),
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
                     Breaks = { new BreakPeriod(2000, 28000) }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
index ae23c4573c..98cceefaf5 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHidden.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = new ManiaModHidden(),
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
                     Breaks = { new BreakPeriod(2000, 28000) }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 51730e2b43..7e2a0a4dd7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
index 619816a815..c220578833 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
index 7375617aa8..2192184eef 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 4,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 1,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 1,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 Breaks =
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index ace7f23989..5baafb4f79 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             {
                 Autoplay = true,
                 Mod = mod,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects =
                     {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 472c341bdd..0a97933df6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
             Mod = new OsuModDifficultyAdjust(),
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 BeatmapInfo = new BeatmapInfo
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs
index 075fdd88ca..e413606a3d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                         Player.GameplayClockContainer.CurrentTime < 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && !sliderDimmedBeforeStartTime;
                 },
-                Beatmap = new OsuBeatmap
+                Beatmap = () => new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                         Player.GameplayClockContainer.CurrentTime >= 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && sliderDimmed;
                 },
-                Beatmap = new OsuBeatmap
+                Beatmap = () => new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                         Player.GameplayClockContainer.CurrentTime >= 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && sliderDimmed;
                 },
-                Beatmap = new OsuBeatmap
+                Beatmap = () => new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
index 58bdd805c1..fec4a748d3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModHidden { OnlyFadeApproachCircles = { Value = true } },
             Autoplay = true,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs
index 0b3496ba68..c8e7061416 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMirror.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         public void TestCorrectReflections([Values] OsuModMirror.MirrorType type, [Values] bool withStrictTracking) => CreateModTest(new ModTestData
         {
             Autoplay = true,
-            Beatmap = new OsuBeatmap
+            Beatmap = () => new OsuBeatmap
             {
                 HitObjects =
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs
index d3996ebc3b..d7922f8ba7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModNoScope.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index b01bbbfca1..a9a94cfd72 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
index 060a845137..81d753fd2d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
@@ -55,10 +55,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             PassCondition = () => true
         });
 
-        private OsuBeatmap jumpBeatmap =>
+        private OsuBeatmap jumpBeatmap() =>
             createHitCircleBeatmap(new[] { 100, 200, 300, 400 }, 8, 300, 2 * 300);
 
-        private OsuBeatmap streamBeatmap =>
+        private OsuBeatmap streamBeatmap() =>
             createHitCircleBeatmap(new[] { 10, 20, 30, 40, 50, 60, 70, 80 }, 16, 150, 4 * 150);
 
         private OsuBeatmap createHitCircleBeatmap(IEnumerable<int> spacings, int objectsPerSpacing, int interval, int beatLength)
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs
index bd2b205ac8..3d553fa051 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSingleTap.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 2,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 1,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 1,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 Breaks =
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index de3ea5f148..ced69d59de 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             });
         }
 
-        private Beatmap singleSpinnerBeatmap => new Beatmap
+        private Beatmap singleSpinnerBeatmap() => new Beatmap
         {
             HitObjects = new List<HitObject>
             {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
index 726b415977..d295b3d891 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModStrictTracking(),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
index ea048aaa6e..25edda34d4 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index c37660831b..5164d7d01b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Autoplay = false,
                 Mod = new TestAutoMod(),
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
                 },
@@ -47,18 +47,16 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestMissViaNotHitting()
         {
-            var beatmap = new Beatmap
-            {
-                HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
-            };
-
             var hitWindows = new OsuHitWindows();
-            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
+            hitWindows.SetDifficulty(IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY);
 
             CreateModTest(new ModTestData
             {
                 Autoplay = false,
-                Beatmap = beatmap,
+                Beatmap = () => new Beatmap
+                {
+                    HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
+                },
                 PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset >= hitWindows.WindowFor(HitResult.Meh) && !Player.Results[0].IsHit
             });
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
index 6e6be26e43..cf199f062a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModHidden.cs
@@ -31,40 +31,42 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             const double hit_time = 1;
 
-            var beatmap = new Beatmap<TaikoHitObject>
-            {
-                HitObjects = new List<TaikoHitObject>
-                {
-                    new Hit
-                    {
-                        Type = HitType.Rim,
-                        StartTime = hit_time,
-                    },
-                    new Hit
-                    {
-                        Type = HitType.Centre,
-                        StartTime = hit_time * 2,
-                    },
-                },
-                BeatmapInfo =
-                {
-                    Difficulty = new BeatmapDifficulty
-                    {
-                        SliderTickRate = 4,
-                        OverallDifficulty = 0,
-                    },
-                    Ruleset = new TaikoRuleset().RulesetInfo
-                },
-            };
-
-            beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 0.1f });
-
             CreateModTest(new ModTestData
             {
                 Mod = new TaikoModHidden(),
                 Autoplay = true,
                 PassCondition = checkAllMaxResultJudgements(2),
-                Beatmap = beatmap,
+                Beatmap = () =>
+                {
+                    var beatmap = new Beatmap<TaikoHitObject>
+                    {
+                        HitObjects = new List<TaikoHitObject>
+                        {
+                            new Hit
+                            {
+                                Type = HitType.Rim,
+                                StartTime = hit_time,
+                            },
+                            new Hit
+                            {
+                                Type = HitType.Centre,
+                                StartTime = hit_time * 2,
+                            },
+                        },
+                        BeatmapInfo =
+                        {
+                            Difficulty = new BeatmapDifficulty
+                            {
+                                SliderTickRate = 4,
+                                OverallDifficulty = 0,
+                            },
+                            Ruleset = new TaikoRuleset().RulesetInfo
+                        },
+                    };
+
+                    beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 0.1f });
+                    return beatmap;
+                },
             });
         }
     }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs
index caf8aa8e76..6894a19a1f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModRelax.cs
@@ -15,7 +15,26 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         [Test]
         public void TestRelax()
         {
-            var beatmap = new TaikoBeatmap
+            var beatmapForReplay = createBeatmap();
+
+            foreach (var ho in beatmapForReplay.HitObjects)
+                ho.ApplyDefaults(beatmapForReplay.ControlPointInfo, beatmapForReplay.Difficulty);
+
+            var replay = new TaikoAutoGenerator(beatmapForReplay).Generate();
+
+            foreach (var frame in replay.Frames.OfType<TaikoReplayFrame>().Where(r => r.Actions.Any()))
+                frame.Actions = [TaikoAction.LeftCentre];
+
+            CreateModTest(new ModTestData
+            {
+                Mod = new TaikoModRelax(),
+                Beatmap = createBeatmap,
+                ReplayFrames = replay.Frames,
+                Autoplay = false,
+                PassCondition = () => Player.ScoreProcessor.HasCompleted.Value && Player.ScoreProcessor.Accuracy.Value == 1,
+            });
+
+            TaikoBeatmap createBeatmap() => new TaikoBeatmap
             {
                 HitObjects =
                 {
@@ -25,22 +44,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
                     new Swell { StartTime = 1250, Duration = 500 },
                 }
             };
-            foreach (var ho in beatmap.HitObjects)
-                ho.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
-
-            var replay = new TaikoAutoGenerator(beatmap).Generate();
-
-            foreach (var frame in replay.Frames.OfType<TaikoReplayFrame>().Where(r => r.Actions.Any()))
-                frame.Actions = [TaikoAction.LeftCentre];
-
-            CreateModTest(new ModTestData
-            {
-                Mod = new TaikoModRelax(),
-                Beatmap = beatmap,
-                ReplayFrames = replay.Frames,
-                Autoplay = false,
-                PassCondition = () => Player.ScoreProcessor.HasCompleted.Value && Player.ScoreProcessor.Accuracy.Value == 1,
-            });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs
index 3a11a91f82..840bf78ffe 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModSingleTap.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 Breaks =
                 {
diff --git a/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs b/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
index c5e56c6453..7011303ccd 100644
--- a/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
+++ b/osu.Game.Tests/Visual/Mods/TestSceneModAccuracyChallenge.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Mods
                     MinimumAccuracy = { Value = 0.6 }
                 },
                 Autoplay = false,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(0, 5).Select(i => new HitCircle
                     {
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Mods
                     AccuracyJudgeMode = { Value = ModAccuracyChallenge.AccuracyMode.Standard }
                 },
                 Autoplay = false,
-                Beatmap = new Beatmap
+                Beatmap = () => new Beatmap
                 {
                     HitObjects = Enumerable.Range(0, 5).Select(i => new HitCircle
                     {
diff --git a/osu.Game/Tests/Visual/ModFailConditionTestScene.cs b/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
index 8f0dff055d..364145160d 100644
--- a/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
+++ b/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual
         protected void CreateHitObjectTest(HitObjectTestData testData, bool shouldMiss) => CreateModTest(new ModTestData
         {
             Mod = mod,
-            Beatmap = new Beatmap
+            Beatmap = () => new Beatmap
             {
                 BeatmapInfo = { Ruleset = CreatePlayerRuleset().RulesetInfo },
                 HitObjects = { testData.HitObject }
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index c2ebcdefac..3265e5c257 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual
             base.TearDownSteps();
         }
 
-        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => CurrentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => CurrentTestData?.Beatmap?.Invoke() ?? base.CreateBeatmap(ruleset);
 
         protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
         {
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Visual
             /// The beatmap for this test case.
             /// </summary>
             [CanBeNull]
-            public IBeatmap Beatmap;
+            public Func<IBeatmap> Beatmap;
 
             /// <summary>
             /// The conditions that cause this test case to pass.