diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
index 4c35ec40b5..ee5ef2f364 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private Live<BeatmapSetInfo> first;
 
+        private const int item_count = 100;
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -46,7 +48,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             beatmapSets.Clear();
 
-            for (int i = 0; i < 100; i++)
+            for (int i = 0; i < item_count; i++)
             {
                 beatmapSets.Add(TestResources.CreateTestBeatmapSetInfo().ToLiveUnmanaged());
             }
@@ -59,6 +61,13 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestRearrangeItems()
         {
+            AddUntilStep("wait for load complete", () =>
+            {
+                return this
+                       .ChildrenOfType<PlaylistItem>()
+                       .Count(i => i.ChildrenOfType<DelayedLoadWrapper>().First().DelayedLoadCompleted) > 6;
+            });
+
             AddUntilStep("wait for animations to complete", () => !playlistOverlay.Transforms.Any());
 
             AddStep("hold 1st item handle", () =>