diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index be1885cfa6..baca8166d1 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -14,7 +14,6 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    [Timeout(10000)]
     public class CatchBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
index 948f088b4e..837474ad9e 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
@@ -14,7 +14,6 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    [Timeout(10000)]
     public class ManiaBeatmapConversionTest : BeatmapConversionTest<ManiaConvertMapping, ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 5f44e1b6b6..4c11efcc7c 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -12,7 +12,6 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    [Timeout(10000)]
     public class OsuBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index b6db333dc9..b3f6a733d3 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -12,7 +12,6 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    [Timeout(10000)]
     public class TaikoBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Taiko";
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 651874e4de..1b3e49de37 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -6,9 +6,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
@@ -108,37 +110,45 @@ namespace osu.Game.Tests.Beatmaps
 
         private ConvertResult convert(string name, Mod[] mods)
         {
-            var beatmap = GetBeatmap(name);
-
-            string beforeConversion = beatmap.Serialize();
-
-            var converterResult = new Dictionary<HitObject, IEnumerable<HitObject>>();
-
-            var working = new ConversionWorkingBeatmap(beatmap)
+            var conversionTask = Task.Factory.StartNew(() =>
             {
-                ConversionGenerated = (o, r, c) =>
+                var beatmap = GetBeatmap(name);
+
+                string beforeConversion = beatmap.Serialize();
+
+                var converterResult = new Dictionary<HitObject, IEnumerable<HitObject>>();
+
+                var working = new ConversionWorkingBeatmap(beatmap)
                 {
-                    converterResult[o] = r;
-                    OnConversionGenerated(o, r, c);
-                }
-            };
+                    ConversionGenerated = (o, r, c) =>
+                    {
+                        converterResult[o] = r;
+                        OnConversionGenerated(o, r, c);
+                    }
+                };
 
-            working.GetPlayableBeatmap(CreateRuleset().RulesetInfo, mods);
+                working.GetPlayableBeatmap(CreateRuleset().RulesetInfo, mods);
 
-            string afterConversion = beatmap.Serialize();
+                string afterConversion = beatmap.Serialize();
 
-            Assert.AreEqual(beforeConversion, afterConversion, "Conversion altered original beatmap");
+                Assert.AreEqual(beforeConversion, afterConversion, "Conversion altered original beatmap");
 
-            return new ConvertResult
-            {
-                Mappings = converterResult.Select(r =>
+                return new ConvertResult
                 {
-                    var mapping = CreateConvertMapping(r.Key);
-                    mapping.StartTime = r.Key.StartTime;
-                    mapping.Objects.AddRange(r.Value.SelectMany(CreateConvertValue));
-                    return mapping;
-                }).ToList()
-            };
+                    Mappings = converterResult.Select(r =>
+                    {
+                        var mapping = CreateConvertMapping(r.Key);
+                        mapping.StartTime = r.Key.StartTime;
+                        mapping.Objects.AddRange(r.Value.SelectMany(CreateConvertValue));
+                        return mapping;
+                    }).ToList()
+                };
+            }, TaskCreationOptions.LongRunning);
+
+            if (!conversionTask.Wait(10000))
+                Assert.Fail("Conversion timed out");
+
+            return conversionTask.WaitSafelyForResult();
         }
 
         protected virtual void OnConversionGenerated(HitObject original, IEnumerable<HitObject> result, IBeatmapConverter beatmapConverter)