diff --git a/extension.json b/extension.json
index 5b194ada1..322c50ab3 100644
--- a/extension.json
+++ b/extension.json
@@ -1001,7 +1001,6 @@
 		"Bundler": "includes/Bundler.php",
 		"EchoAbstractEntity": "includes/model/AbstractEntity.php",
 		"EchoAbstractMapper": "includes/mapper/AbstractMapper.php",
-		"EchoAbstractMapperStub": "tests/phpunit/mapper/EchoAbstractMapperStub.php",
 		"EchoArrayList": "includes/EchoArrayList.php",
 		"EchoAttributeManager": "includes/AttributeManager.php",
 		"EchoCachedList": "includes/EchoCachedList.php",
@@ -1025,8 +1024,6 @@
 		"EchoEventFormatter": "includes/formatters/EchoEventFormatter.php",
 		"EchoEventMapper": "includes/mapper/EventMapper.php",
 		"EchoEventPresentationModel": "includes/formatters/EventPresentationModel.php",
-		"EchoExecuteFirstArgumentStub": "tests/phpunit/mapper/EchoExecuteFirstArgumentStub.php",
-		"StubCompatTemp": "tests/phpunit/mapper/EchoExecuteFirstArgumentStub.php",
 		"EchoFilteredSequentialIterator": "includes/iterator/FilteredSequentialIterator.php",
 		"EchoFlyoutFormatter": "includes/formatters/EchoFlyoutFormatter.php",
 		"EchoForeignNotifications": "includes/ForeignNotifications.php",
@@ -1088,5 +1085,10 @@
 		"SpecialNotificationsMarkRead": "includes/special/SpecialNotificationsMarkRead.php",
 		"UpdateEchoSchemaForSuppression": "maintenance/updateEchoSchemaForSuppression.php",
 		"EchoUpdatePerUserBlacklist": "maintenance/updatePerUserBlacklist.php"
+	},
+	"TestAutoloadClasses": {
+		"EchoAbstractMapperStub": "tests/phpunit/mapper/EchoAbstractMapperStub.php",
+		"EchoExecuteFirstArgumentStub": "tests/phpunit/mapper/EchoExecuteFirstArgumentStub.php",
+		"StubCompatTemp": "tests/phpunit/mapper/EchoExecuteFirstArgumentStub.php"
 	}
 }