diff --git a/osu-framework b/osu-framework
index f858902d16..16e6a453db 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit f858902d167c42d000662cb3a1cd202d723ea182
+Subproject commit 16e6a453db9a8f4454238a2911eb5f1444b7ec2a
diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs
index decf0c9bdb..02f425c296 100644
--- a/osu.Game/Tests/Visual/OsuTestCase.cs
+++ b/osu.Game/Tests/Visual/OsuTestCase.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using System.IO;
 using System.Reflection;
 using osu.Framework.Testing;
@@ -10,28 +9,27 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class OsuTestCase : TestCase
     {
-        public override void RunTest()
-        {
-            using (var host = new CleanRunHeadlessGameHost($"test-{Guid.NewGuid()}", realtime: false))
-                host.Run(new OsuTestCaseTestRunner(this));
-        }
+        protected override ITestCaseTestRunner CreateRunner() => new OsuTestCaseTestRunner();
 
-        public class OsuTestCaseTestRunner : OsuGameBase
+        public class OsuTestCaseTestRunner : OsuGameBase, ITestCaseTestRunner
         {
-            private readonly OsuTestCase testCase;
-
             protected override string MainResourceFile => File.Exists(base.MainResourceFile) ? base.MainResourceFile : Assembly.GetExecutingAssembly().Location;
 
-            public OsuTestCaseTestRunner(OsuTestCase testCase)
+            private readonly TestCaseTestRunner.TestRunner runner;
+
+            public OsuTestCaseTestRunner()
             {
-                this.testCase = testCase;
+                runner = new TestCaseTestRunner.TestRunner();
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                Add(new TestCaseTestRunner.TestRunner(testCase));
+
+                Add(runner);
             }
+
+            public void RunTestBlocking(TestCase test) => runner.RunTestBlocking(test);
         }
     }
 }