diff --git a/osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs
index 43f6f0e4db..1cfd56e2c8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs
@@ -9,7 +9,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestCaseLoadingAnimation : GridTestCase
+    public class TestCaseLoadingAnimation : GridTestScene //todo: this should be an OsuTestCase
     {
         public TestCaseLoadingAnimation()
             : base(2, 2)
diff --git a/osu.Game.Tests/Visual/UserInterface/TestCaseOsuIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestCaseOsuIcon.cs
index a57e11cb0c..cef122ff58 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestCaseOsuIcon.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestCaseOsuIcon.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osuTK;
 using osuTK.Graphics;
@@ -17,7 +16,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseOsuIcon : TestCase
+    public class TestCaseOsuIcon : OsuTestCase
     {
         public TestCaseOsuIcon()
         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 66552c43e0..c068c5b0d4 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -220,8 +220,10 @@ namespace osu.Game
             // TODO: This is temporary until we reimplement the local FPS display.
             // It's just to allow end-users to access the framework FPS display without knowing the shortcut key.
             fpsDisplayVisible = LocalConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay);
-            fpsDisplayVisible.ValueChanged += visible => { FrameStatisticsMode = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
+            fpsDisplayVisible.ValueChanged += visible => { FrameStatistics.Value = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
             fpsDisplayVisible.TriggerChange();
+
+            FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
         }
 
         private void runMigrations()
diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs
index 1f475209a4..3a40db4571 100644
--- a/osu.Game/Tests/Visual/OsuTestCase.cs
+++ b/osu.Game/Tests/Visual/OsuTestCase.cs
@@ -15,7 +15,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class OsuTestCase : TestCase
+    public abstract class OsuTestCase : TestScene
     {
         [Cached(typeof(Bindable<WorkingBeatmap>))]
         [Cached(typeof(IBindable<WorkingBeatmap>))]
@@ -76,21 +76,21 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        protected override ITestCaseTestRunner CreateRunner() => new OsuTestCaseTestRunner();
+        protected override ITestSceneTestRunner CreateRunner() => new OsuTestCaseTestRunner();
 
-        public class OsuTestCaseTestRunner : OsuGameBase, ITestCaseTestRunner
+        public class OsuTestCaseTestRunner : OsuGameBase, ITestSceneTestRunner
         {
-            private TestCaseTestRunner.TestRunner runner;
+            private TestSceneTestRunner.TestRunner runner;
 
             protected override void LoadAsyncComplete()
             {
                 // this has to be run here rather than LoadComplete because
                 // TestCase.cs is checking the IsLoaded state (on another thread) and expects
                 // the runner to be loaded at that point.
-                Add(runner = new TestCaseTestRunner.TestRunner());
+                Add(runner = new TestSceneTestRunner.TestRunner());
             }
 
-            public void RunTestBlocking(TestCase test) => runner.RunTestBlocking(test);
+            public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);
         }
 
         private class OsuTestBeatmap : BindableBeatmap
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8f733a5c55..66d298f8c1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.502.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.508.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.514.0" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e5b4d61615..ccec475d98 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -105,8 +105,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.128.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.502.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.502.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.514.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.514.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />