diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
index 7531a7be2c..2ee5e649a8 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit;
@@ -11,19 +12,66 @@
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestSceneBeatDivisorControl : OsuTestScene
+    public class TestSceneBeatDivisorControl : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BindableBeatDivisor) };
+        private BeatDivisorControl beatDivisorControl;
+        private BindableBeatDivisor bindableBeatDivisor;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new BeatDivisorControl(new BindableBeatDivisor())
+            Child = beatDivisorControl = new BeatDivisorControl(bindableBeatDivisor = new BindableBeatDivisor())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(90, 90)
             };
         }
+
+        [Test]
+        public void TestBindableBeatDivisor()
+        {
+            AddStep("Reset", () => reset());
+            AddRepeatStep("Move previous", () => bindableBeatDivisor.Previous(), 4);
+            AddAssert("Position at 4", () => bindableBeatDivisor.Value == 4);
+            AddRepeatStep("Move next", () => bindableBeatDivisor.Next(), 3);
+            AddAssert("Position at 12", () => bindableBeatDivisor.Value == 12);
+        }
+
+        [Test]
+        public void TestMouseInput()
+        {
+            AddStep("Reset", () => reset());
+            AddStep("Move to marker", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(38, -18));
+                InputManager.PressButton(osuTK.Input.MouseButton.Left);
+            });
+            AddStep("Mote to divisor 8", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(0, -18));
+                InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
+            });
+            AddAssert("Position at 8", () => bindableBeatDivisor.Value == 8);
+            AddStep("Prepare to move marker", () => { InputManager.PressButton(osuTK.Input.MouseButton.Left); });
+            AddStep("Trigger marker jump", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(30, -18));
+            });
+            AddStep("Move to divisor ~10", () =>
+            {
+                InputManager.MoveMouseTo(beatDivisorControl, new Vector2(10, -18));
+                InputManager.ReleaseButton(osuTK.Input.MouseButton.Left);
+            });
+            AddAssert("Position clamped to 8", () => bindableBeatDivisor.Value == 8);
+
+        }
+
+        private void reset()
+        {
+            bindableBeatDivisor.Value = 16;
+            InputManager.MoveMouseTo(beatDivisorControl, new Vector2(beatDivisorControl.Width, beatDivisorControl.Height));
+        }
     }
 }