diff --git a/tests/test_ext.py b/tests/test_ext.py
index 748aebb3..b73e2bae 100644
--- a/tests/test_ext.py
+++ b/tests/test_ext.py
@@ -11,7 +11,7 @@ from mopidy import config, exceptions, ext
 from tests import IsA, any_unicode
 
 
-class TestExtension(ext.Extension):
+class DummyExtension(ext.Extension):
     dist_name = 'Mopidy-Foobar'
     ext_name = 'foobar'
     version = '1.2.3'
@@ -20,10 +20,10 @@ class TestExtension(ext.Extension):
         return '[foobar]\nenabled = true'
 
 
-any_testextension = IsA(TestExtension)
+any_testextension = IsA(DummyExtension)
 
 
-class ExtensionTest(object):
+class TestExtension(object):
 
     @pytest.fixture
     def extension(self):
@@ -54,7 +54,7 @@ class ExtensionTest(object):
             extension.setup(None)
 
 
-class LoadExtensionsTest(object):
+class TestLoadExtensions(object):
 
     @pytest.yield_fixture
     def iter_entry_points_mock(self, request):
@@ -70,7 +70,7 @@ class LoadExtensionsTest(object):
 
     def test_load_extensions(self, iter_entry_points_mock):
         mock_entry_point = mock.Mock()
-        mock_entry_point.load.return_value = TestExtension
+        mock_entry_point.load.return_value = DummyExtension
 
         iter_entry_points_mock.return_value = [mock_entry_point]
 
@@ -94,7 +94,7 @@ class LoadExtensionsTest(object):
 
     def test_gets_instance(self, iter_entry_points_mock):
         mock_entry_point = mock.Mock()
-        mock_entry_point.load.return_value = TestExtension()
+        mock_entry_point.load.return_value = DummyExtension()
 
         iter_entry_points_mock.return_value = [mock_entry_point]
 
@@ -113,11 +113,11 @@ class LoadExtensionsTest(object):
 
     def test_get_config_schema_fails(self, iter_entry_points_mock):
         mock_entry_point = mock.Mock()
-        mock_entry_point.load.return_value = TestExtension
+        mock_entry_point.load.return_value = DummyExtension
 
         iter_entry_points_mock.return_value = [mock_entry_point]
 
-        with mock.patch.object(TestExtension, 'get_config_schema') as get:
+        with mock.patch.object(DummyExtension, 'get_config_schema') as get:
             get.side_effect = Exception
 
             assert ext.load_extensions() == []
@@ -125,11 +125,11 @@ class LoadExtensionsTest(object):
 
     def test_get_default_config_fails(self, iter_entry_points_mock):
         mock_entry_point = mock.Mock()
-        mock_entry_point.load.return_value = TestExtension
+        mock_entry_point.load.return_value = DummyExtension
 
         iter_entry_points_mock.return_value = [mock_entry_point]
 
-        with mock.patch.object(TestExtension, 'get_default_config') as get:
+        with mock.patch.object(DummyExtension, 'get_default_config') as get:
             get.side_effect = Exception
 
             assert ext.load_extensions() == []
@@ -137,22 +137,22 @@ class LoadExtensionsTest(object):
 
     def test_get_command_fails(self, iter_entry_points_mock):
         mock_entry_point = mock.Mock()
-        mock_entry_point.load.return_value = TestExtension
+        mock_entry_point.load.return_value = DummyExtension
 
         iter_entry_points_mock.return_value = [mock_entry_point]
 
-        with mock.patch.object(TestExtension, 'get_command') as get:
+        with mock.patch.object(DummyExtension, 'get_command') as get:
             get.side_effect = Exception
 
             assert ext.load_extensions() == []
             get.assert_called_once_with()
 
 
-class ValidateExtensionDataTest(object):
+class TestValidateExtensionData(object):
 
     @pytest.fixture
     def ext_data(self):
-        extension = TestExtension()
+        extension = DummyExtension()
 
         entry_point = mock.Mock()
         entry_point.name = extension.ext_name