diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 720d93cb10..0d6ed67767 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Chat
         }
 
         [Test]
-        public void TestCaseInsensitiveLinks()
+        public void TestInsensitiveLinks()
         {
             Message result = MessageFormatter.FormatMessage(new Message { Content = "look: http://puu.sh/7Ggh8xcC6/asf0asd9876.NEF" });
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
similarity index 91%
rename from osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
index 9befac94f2..b9a6d74f19 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestCaseLoadingAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
@@ -9,9 +9,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestCaseLoadingAnimation : GridTestScene //todo: this should be an OsuTestScene
+    public class TestSceneLoadingAnimation : GridTestScene //todo: this should be an OsuTestScene
     {
-        public TestCaseLoadingAnimation()
+        public TestSceneLoadingAnimation()
             : base(2, 2)
         {
             LoadingAnimation loading;
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 2028671b0e..f66b374cd7 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -13,7 +13,7 @@ using osu.Game.Tests.Resources;
 namespace osu.Game.Tests
 {
     /// <summary>
-    /// A <see cref="WorkingBeatmap"/> that is used for testcases that include waveforms.
+    /// A <see cref="WorkingBeatmap"/> that is used for test scenes that include waveforms.
     /// </summary>
     public class WaveformTestBeatmap : WorkingBeatmap
     {
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index f628f3c29a..9b775fd498 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.Visual
             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
+                // TestScene.cs is checking the IsLoaded state (on another thread) and expects
                 // the runner to be loaded at that point.
                 Add(runner = new TestSceneTestRunner.TestRunner());
             }