diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 917d12ebb1..3c95b990e1 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -229,10 +229,10 @@ public Track GetVirtual(double length = double.PositiveInfinity)
             /// </summary>
             public class TrackVirtualManual : Track
             {
-                private readonly StopwatchClock stopwatchClock = new StopwatchClock();
-
                 private readonly IFrameBasedClock referenceClock;
 
+                private bool running;
+
                 public TrackVirtualManual(IFrameBasedClock referenceClock)
                 {
                     this.referenceClock = referenceClock;
@@ -241,32 +241,55 @@ public TrackVirtualManual(IFrameBasedClock referenceClock)
 
                 public override bool Seek(double seek)
                 {
-                    var offset = Math.Clamp(seek, 0, Length);
+                    accumulated = Math.Min(seek, Length);
+                    lastReferenceTime = null;
 
-                    stopwatchClock.Seek(offset);
-
-                    return offset == seek;
+                    return accumulated == seek;
                 }
 
-                public override void Start() => stopwatchClock.Start();
+                public override void Start()
+                {
+                    running = true;
+                }
 
                 public override void Reset()
                 {
-                    stopwatchClock.Seek(0);
+                    Seek(0);
                     base.Reset();
                 }
 
-                public override void Stop() => stopwatchClock.Stop();
+                public override void Stop()
+                {
+                    if (running)
+                    {
+                        running = false;
+                        lastReferenceTime = null;
+                    }
+                }
 
-                public override bool IsRunning => stopwatchClock.IsRunning;
+                public override bool IsRunning => running;
 
-                public override double CurrentTime => stopwatchClock.CurrentTime;
+                private double? lastReferenceTime;
+
+                private double accumulated;
+
+                public override double CurrentTime => Math.Min(accumulated, Length);
 
                 protected override void UpdateState()
                 {
                     base.UpdateState();
 
-                    stopwatchClock.Rate = Rate * referenceClock.Rate;
+                    if (running)
+                    {
+                        double refTime = referenceClock.CurrentTime;
+
+                        if (lastReferenceTime.HasValue)
+                            accumulated += (refTime - lastReferenceTime.Value) * Rate;
+
+                        lastReferenceTime = refTime;
+                    }
+
+                    Console.WriteLine($"t={CurrentTime}");
 
                     if (CurrentTime >= Length)
                     {