diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index f9445a9a96..db347960ef 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
@@ -30,25 +31,23 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         [Test]
         public void TestCircleInCenter()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
                     new HitCircle
                     {
                         StartTime = 3000,
-                        Position = playfield_centre // Playfield is 640 x 480.
+                        Position = playfield_centre
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestCircleNearEdge()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -58,15 +57,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(5, 5)
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestCircleNearEdgeStackedOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenCircle(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -77,15 +74,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         StackHeight = 5
                     }
                 }
-            };
-
-            assertOffscreenCircle(beatmap);
+            });
         }
 
         [Test]
         public void TestCircleOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenCircle(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -95,15 +90,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(0, 0)
                     }
                 }
-            };
-
-            assertOffscreenCircle(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderInCenter()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -118,15 +111,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestSliderNearEdge()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -141,15 +132,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestSliderNearEdgeStackedOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -165,15 +154,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         StackHeight = 5
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenStart()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -188,15 +175,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenEnd()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -211,15 +196,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenPath()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -236,14 +219,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
+            });
+        }
 
-            assertOffscreenSlider(beatmap);
+        private void assertOk(IBeatmap beatmap)
+        {
+            Assert.That(check.Run(new TestWorkingBeatmap(beatmap)), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -251,7 +237,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 27cae2ecc1..54b167aaf3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            foreach (var hitobject in beatmap.HitObjects)
+            foreach (var hitobject in workingBeatmap.Beatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 1c7ab00bbb..9b9383d547 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 635e3bb0f3..d61f0989a6 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -14,13 +15,13 @@ namespace osu.Game.Tests.Editing.Checks
     public class CheckBackgroundTest
     {
         private CheckBackground check;
-        private IBeatmap beatmap;
+        private WorkingBeatmap beatmap;
 
         [SetUp]
         public void Setup()
         {
             check = new CheckBackground();
-            beatmap = new Beatmap<HitObject>
+            beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
             {
                 BeatmapInfo = new BeatmapInfo
                 {
@@ -33,7 +34,7 @@ namespace osu.Game.Tests.Editing.Checks
                         })
                     }
                 }
-            };
+            });
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index f9bced7beb..40714e8c7e 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.Edit
             new CheckBackground(),
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 93da42425c..d2fffeea4e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            if (beatmap.Metadata.BackgroundFile == null)
+            if (workingBeatmap.Metadata?.BackgroundFile == null)
             {
                 yield return new IssueTemplateNoneSet(this).Create();
 
@@ -29,13 +29,13 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             // If the background is set, also make sure it still exists.
 
-            var set = beatmap.BeatmapInfo.BeatmapSet;
-            var file = set.Files.FirstOrDefault(f => f.Filename == beatmap.Metadata.BackgroundFile);
+            var set = workingBeatmap.BeatmapInfo.BeatmapSet;
+            var file = set.Files.FirstOrDefault(f => f.Filename == workingBeatmap.Metadata.BackgroundFile);
 
             if (file != null)
                 yield break;
 
-            yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(workingBeatmap.Metadata.BackgroundFile);
         }
 
         public class IssueTemplateNoneSet : IssueTemplate
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index f284240092..a2814ee603 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="beatmap">The beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(IBeatmap beatmap);
+        /// <param name="workingBeatmap">The beatmap to run the check on.</param>
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 61d8119635..12be8815e1 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap beatmap);
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 550fbe2950..160a14caac 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -61,7 +62,7 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            protected EditorBeatmap Beatmap { get; private set; }
+            protected WorkingBeatmap Beatmap { get; private set; }
 
             [Resolved]
             private Bindable<Issue> selectedIssue { get; set; }