diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
index 7bdf131e0d..41304dcd24 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
@@ -3,9 +3,11 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Tests.Beatmaps;
@@ -26,6 +28,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             base.SetUpSteps();
             AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
             AddStep("seek to first control point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time));
+            AddStep("set distance spacing to 1", () =>
+            {
+                var distanceSpacing = (BindableFloat)Editor.ChildrenOfType<HitObjectComposer>().Single().DistanceSpacingMultiplier;
+                distanceSpacing.Value = 1;
+            });
         }
 
         [TestCase(true)]
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
index b43b2b1461..23131668a0 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
@@ -3,12 +3,15 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
@@ -61,9 +64,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             }));
             AddStep("set beat divisor to 1/1", () =>
             {
-                var beatDivisor = (BindableBeatDivisor)Editor.Dependencies.Get(typeof(BindableBeatDivisor));
+                var beatDivisor = Editor.Dependencies.Get<BindableBeatDivisor>();
                 beatDivisor.Value = 1;
             });
+            AddStep("set distance spacing to 1", () =>
+            {
+                var distanceSpacing = (BindableFloat)Editor.ChildrenOfType<HitObjectComposer>().Single().DistanceSpacingMultiplier;
+                distanceSpacing.Value = 1;
+            });
         }
 
         [Test]
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 43f22e4e90..d9312cb7ae 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Tests.Editing
             BeatDivisor.Value = 1;
 
             composer.EditorBeatmap.Difficulty.SliderMultiplier = 1;
+            composer.EditorBeatmap.BeatmapInfo.DistanceSpacing = 1;
             composer.EditorBeatmap.ControlPointInfo.Clear();
             composer.EditorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
         });