diff --git a/autoload.php b/autoload.php
index f7e5101c8..46728d8b8 100644
--- a/autoload.php
+++ b/autoload.php
@@ -9,16 +9,16 @@ $wgAutoloadClasses += array(
 	'ApiEchoMarkSeen' => __DIR__ . '/includes/api/ApiEchoMarkSeen.php',
 	'ApiEchoNotifications' => __DIR__ . '/includes/api/ApiEchoNotifications.php',
 	'ApiEchoNotificationsTest' => __DIR__ . '/tests/phpunit/api/ApiEchoNotificationsTest.php',
-	'BatchRowUpdateTest' => __DIR__ . '/tests/phpunit/includes/BatchRowUpdateTest.php',
+	'BatchRowUpdateTest' => __DIR__ . '/tests/phpunit/BatchRowUpdateTest.php',
 	'CallbackFilterIterator' => __DIR__ . '/includes/iterator/CallbackFilterIterator.php',
-	'ContainmentSetTest' => __DIR__ . '/tests/phpunit/includes/ContainmentSetTest.php',
+	'ContainmentSetTest' => __DIR__ . '/tests/phpunit/ContainmentSetTest.php',
 	'EchoAbstractEntity' => __DIR__ . '/includes/model/AbstractEntity.php',
 	'EchoAbstractMapper' => __DIR__ . '/includes/mapper/AbstractMapper.php',
-	'EchoAbstractMapperStub' => __DIR__ . '/tests/phpunit/includes/mapper/AbstractMapperTest.php',
-	'EchoAbstractMapperTest' => __DIR__ . '/tests/phpunit/includes/mapper/AbstractMapperTest.php',
+	'EchoAbstractMapperStub' => __DIR__ . '/tests/phpunit/mapper/AbstractMapperTest.php',
+	'EchoAbstractMapperTest' => __DIR__ . '/tests/phpunit/mapper/AbstractMapperTest.php',
 	'EchoArrayList' => __DIR__ . '/includes/ContainmentSet.php',
 	'EchoAttributeManager' => __DIR__ . '/includes/AttributeManager.php',
-	'EchoAttributeManagerTest' => __DIR__ . '/tests/phpunit/includes/AttributeManagerTest.php',
+	'EchoAttributeManagerTest' => __DIR__ . '/tests/phpunit/AttributeManagerTest.php',
 	'EchoBasicFormatter' => __DIR__ . '/includes/formatters/BasicFormatter.php',
 	'EchoBatchRowIterator' => __DIR__ . '/includes/BatchRowUpdate.php',
 	'EchoBatchRowUpdate' => __DIR__ . '/includes/BatchRowUpdate.php',
@@ -33,21 +33,21 @@ $wgAutoloadClasses += array(
 	'EchoDeferredMarkAsReadUpdate' => __DIR__ . '/includes/DeferredMarkAsReadUpdate.php',
 	'EchoDiffGroup' => __DIR__ . '/includes/DiffParser.php',
 	'EchoDiffParser' => __DIR__ . '/includes/DiffParser.php',
-	'EchoDiffParserTest' => __DIR__ . '/tests/phpunit/includes/DiffParserTest.php',
+	'EchoDiffParserTest' => __DIR__ . '/tests/phpunit/DiffParserTest.php',
 	'EchoDiscussionParser' => __DIR__ . '/includes/DiscussionParser.php',
-	'EchoDiscussionParserTest' => __DIR__ . '/tests/phpunit/includes/DiscussionParserTest.php',
+	'EchoDiscussionParserTest' => __DIR__ . '/tests/phpunit/DiscussionParserTest.php',
 	'EchoEditFormatter' => __DIR__ . '/includes/formatters/EditFormatter.php',
 	'EchoEditUserTalkFormatter' => __DIR__ . '/includes/formatters/EditUserTalkFormatter.php',
 	'EchoEmailDecorator' => __DIR__ . '/includes/EmailFormatter.php',
 	'EchoEmailDigest' => __DIR__ . '/includes/EmailFormatter.php',
 	'EchoEmailFormatter' => __DIR__ . '/includes/EmailFormatter.php',
-	'EchoEmailFormatterTest' => __DIR__ . '/tests/phpunit/includes/EmailFormatterTest.php',
+	'EchoEmailFormatterTest' => __DIR__ . '/tests/phpunit/EmailFormatterTest.php',
 	'EchoEmailMode' => __DIR__ . '/includes/EmailFormatter.php',
 	'EchoEmailSingle' => __DIR__ . '/includes/EmailFormatter.php',
 	'EchoEvent' => __DIR__ . '/includes/model/Event.php',
 	'EchoEventMapper' => __DIR__ . '/includes/mapper/EventMapper.php',
-	'EchoEventMapperTest' => __DIR__ . '/tests/phpunit/includes/mapper/EventMapperTest.php',
-	'EchoExecuteFirstArgumentStub' => __DIR__ . '/tests/phpunit/includes/mapper/NotificationMapperTest.php',
+	'EchoEventMapperTest' => __DIR__ . '/tests/phpunit/mapper/EventMapperTest.php',
+	'EchoExecuteFirstArgumentStub' => __DIR__ . '/tests/phpunit/mapper/NotificationMapperTest.php',
 	'EchoFilteredSequentialIterator' => __DIR__ . '/includes/iterator/FilteredSequentialIterator.php',
 	'EchoHTMLEmailDecorator' => __DIR__ . '/includes/EmailFormatter.php',
 	'EchoHTMLEmailFormatter' => __DIR__ . '/includes/EmailFormatter.php',
@@ -64,7 +64,7 @@ $wgAutoloadClasses += array(
 	'EchoNotificationFormatterTest' => __DIR__ . '/tests/phpunit/formatters/NotificationFormatterTest.php',
 	'EchoNotificationJob' => __DIR__ . '/includes/jobs/NotificationJob.php',
 	'EchoNotificationMapper' => __DIR__ . '/includes/mapper/NotificationMapper.php',
-	'EchoNotificationMapperTest' => __DIR__ . '/tests/phpunit/includes/mapper/NotificationMapperTest.php',
+	'EchoNotificationMapperTest' => __DIR__ . '/tests/phpunit/mapper/NotificationMapperTest.php',
 	'EchoNotificationTest' => __DIR__ . '/tests/phpunit/model/NotificationTest.php',
 	'EchoNotifier' => __DIR__ . '/Notifier.php',
 	'EchoOnWikiList' => __DIR__ . '/includes/ContainmentSet.php',
@@ -72,28 +72,28 @@ $wgAutoloadClasses += array(
 	'EchoRevisionLocalCache' => __DIR__ . '/includes/cache/RevisionLocalCache.php',
 	'EchoRowUpdateGenerator' => __DIR__ . '/includes/BatchRowUpdate.php',
 	'EchoSuppressionRowUpdateGenerator' => __DIR__ . '/includes/schemaUpdate.php',
-	'EchoTalkPageFunctionalTest' => __DIR__ . '/tests/phpunit/includes/TalkPageFunctionalTest.php',
+	'EchoTalkPageFunctionalTest' => __DIR__ . '/tests/phpunit/TalkPageFunctionalTest.php',
 	'EchoTargetPage' => __DIR__ . '/includes/model/TargetPage.php',
 	'EchoTargetPageMapper' => __DIR__ . '/includes/mapper/TargetPageMapper.php',
-	'EchoTargetPageMapperTest' => __DIR__ . '/tests/phpunit/includes/mapper/TargetPageMapperTest.php',
+	'EchoTargetPageMapperTest' => __DIR__ . '/tests/phpunit/mapper/TargetPageMapperTest.php',
 	'EchoTargetPageTest' => __DIR__ . '/tests/phpunit/model/TargetPageTest.php',
 	'EchoTextEmailDecorator' => __DIR__ . '/includes/EmailFormatter.php',
 	'EchoTextEmailFormatter' => __DIR__ . '/includes/EmailFormatter.php',
 	'EchoTitleLocalCache' => __DIR__ . '/includes/cache/TitleLocalCache.php',
-	'EchoTitleLocalCacheTest' => __DIR__ . '/tests/phpunit/includes/cache/TitleLocalCacheTest.php',
+	'EchoTitleLocalCacheTest' => __DIR__ . '/tests/phpunit/cache/TitleLocalCacheTest.php',
 	'EchoUserLocator' => __DIR__ . '/includes/UserLocator.php',
-	'EchoUserLocatorTest' => __DIR__ . '/tests/phpunit/includes/UserLocatorTest.php',
+	'EchoUserLocatorTest' => __DIR__ . '/tests/phpunit/UserLocatorTest.php',
 	'EchoUserNotificationGateway' => __DIR__ . '/includes/gateway/UserNotificationGateway.php',
-	'EchoUserNotificationGatewayTest' => __DIR__ . '/tests/phpunit/includes/gateway/UserNotificationGatewayTest.php',
+	'EchoUserNotificationGatewayTest' => __DIR__ . '/tests/phpunit/gateway/UserNotificationGatewayTest.php',
 	'EchoUserRightsFormatter' => __DIR__ . '/includes/formatters/UserRightsFormatter.php',
-	'FilteredSequentialIteratorTest' => __DIR__ . '/tests/phpunit/includes/iterator/FilteredSequentialIteratorTest.php',
+	'FilteredSequentialIteratorTest' => __DIR__ . '/tests/phpunit/iterator/FilteredSequentialIteratorTest.php',
 	'MWEchoDbFactory' => __DIR__ . '/includes/EchoDbFactory.php',
-	'MWEchoDbFactoryTest' => __DIR__ . '/tests/phpunit/includes/EchoDbFactoryTest.php',
+	'MWEchoDbFactoryTest' => __DIR__ . '/tests/phpunit/EchoDbFactoryTest.php',
 	'MWEchoEmailBatch' => __DIR__ . '/includes/EmailBatch.php',
 	'MWEchoEmailBundler' => __DIR__ . '/includes/EmailBundler.php',
 	'MWEchoEventLogging' => __DIR__ . '/includes/EventLogging.php',
 	'MWEchoNotifUser' => __DIR__ . '/includes/NotifUser.php',
-	'MWEchoNotifUserTest' => __DIR__ . '/tests/phpunit/includes/NotifUserTest.php',
+	'MWEchoNotifUserTest' => __DIR__ . '/tests/phpunit/NotifUserTest.php',
 	'MWEchoNotificationEmailBundleJob' => __DIR__ . '/includes/jobs/NotificationEmailBundleJob.php',
 	'NotificationControllerTest' => __DIR__ . '/tests/phpunit/controller/NotificationControllerTest.php',
 	'NotificationsTest' => __DIR__ . '/tests/NotificationsTest.php',
diff --git a/tests/phpunit/includes/AttributeManagerTest.php b/tests/phpunit/AttributeManagerTest.php
similarity index 100%
rename from tests/phpunit/includes/AttributeManagerTest.php
rename to tests/phpunit/AttributeManagerTest.php
diff --git a/tests/phpunit/includes/BatchRowUpdateTest.php b/tests/phpunit/BatchRowUpdateTest.php
similarity index 99%
rename from tests/phpunit/includes/BatchRowUpdateTest.php
rename to tests/phpunit/BatchRowUpdateTest.php
index c99562871..5a7f18941 100644
--- a/tests/phpunit/includes/BatchRowUpdateTest.php
+++ b/tests/phpunit/BatchRowUpdateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . "/../../../includes/BatchRowUpdate.php";
+require_once __DIR__ . "/../../includes/BatchRowUpdate.php";
 
 /**
  * Tests for BatchRowUpdate and its components
diff --git a/tests/phpunit/includes/ContainmentSetTest.php b/tests/phpunit/ContainmentSetTest.php
similarity index 100%
rename from tests/phpunit/includes/ContainmentSetTest.php
rename to tests/phpunit/ContainmentSetTest.php
diff --git a/tests/phpunit/includes/DiffParserTest.php b/tests/phpunit/DiffParserTest.php
similarity index 100%
rename from tests/phpunit/includes/DiffParserTest.php
rename to tests/phpunit/DiffParserTest.php
diff --git a/tests/phpunit/includes/DiscussionParserTest.php b/tests/phpunit/DiscussionParserTest.php
similarity index 100%
rename from tests/phpunit/includes/DiscussionParserTest.php
rename to tests/phpunit/DiscussionParserTest.php
diff --git a/tests/phpunit/includes/EchoDbFactoryTest.php b/tests/phpunit/EchoDbFactoryTest.php
similarity index 100%
rename from tests/phpunit/includes/EchoDbFactoryTest.php
rename to tests/phpunit/EchoDbFactoryTest.php
diff --git a/tests/phpunit/includes/EmailFormatterTest.php b/tests/phpunit/EmailFormatterTest.php
similarity index 100%
rename from tests/phpunit/includes/EmailFormatterTest.php
rename to tests/phpunit/EmailFormatterTest.php
diff --git a/tests/phpunit/includes/NotifUserTest.php b/tests/phpunit/NotifUserTest.php
similarity index 100%
rename from tests/phpunit/includes/NotifUserTest.php
rename to tests/phpunit/NotifUserTest.php
diff --git a/tests/phpunit/includes/TalkPageFunctionalTest.php b/tests/phpunit/TalkPageFunctionalTest.php
similarity index 100%
rename from tests/phpunit/includes/TalkPageFunctionalTest.php
rename to tests/phpunit/TalkPageFunctionalTest.php
diff --git a/tests/phpunit/includes/UserLocatorTest.php b/tests/phpunit/UserLocatorTest.php
similarity index 100%
rename from tests/phpunit/includes/UserLocatorTest.php
rename to tests/phpunit/UserLocatorTest.php
diff --git a/tests/phpunit/includes/cache/TitleLocalCacheTest.php b/tests/phpunit/cache/TitleLocalCacheTest.php
similarity index 100%
rename from tests/phpunit/includes/cache/TitleLocalCacheTest.php
rename to tests/phpunit/cache/TitleLocalCacheTest.php
diff --git a/tests/phpunit/includes/gateway/UserNotificationGatewayTest.php b/tests/phpunit/gateway/UserNotificationGatewayTest.php
similarity index 100%
rename from tests/phpunit/includes/gateway/UserNotificationGatewayTest.php
rename to tests/phpunit/gateway/UserNotificationGatewayTest.php
diff --git a/tests/phpunit/includes/iterator/FilteredSequentialIteratorTest.php b/tests/phpunit/iterator/FilteredSequentialIteratorTest.php
similarity index 100%
rename from tests/phpunit/includes/iterator/FilteredSequentialIteratorTest.php
rename to tests/phpunit/iterator/FilteredSequentialIteratorTest.php
diff --git a/tests/phpunit/includes/mapper/AbstractMapperTest.php b/tests/phpunit/mapper/AbstractMapperTest.php
similarity index 100%
rename from tests/phpunit/includes/mapper/AbstractMapperTest.php
rename to tests/phpunit/mapper/AbstractMapperTest.php
diff --git a/tests/phpunit/includes/mapper/EventMapperTest.php b/tests/phpunit/mapper/EventMapperTest.php
similarity index 100%
rename from tests/phpunit/includes/mapper/EventMapperTest.php
rename to tests/phpunit/mapper/EventMapperTest.php
diff --git a/tests/phpunit/includes/mapper/NotificationMapperTest.php b/tests/phpunit/mapper/NotificationMapperTest.php
similarity index 100%
rename from tests/phpunit/includes/mapper/NotificationMapperTest.php
rename to tests/phpunit/mapper/NotificationMapperTest.php
diff --git a/tests/phpunit/includes/mapper/TargetPageMapperTest.php b/tests/phpunit/mapper/TargetPageMapperTest.php
similarity index 100%
rename from tests/phpunit/includes/mapper/TargetPageMapperTest.php
rename to tests/phpunit/mapper/TargetPageMapperTest.php
diff --git a/tests/phpunit/includes/revision_txt/138274875.txt b/tests/phpunit/revision_txt/138274875.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/138274875.txt
rename to tests/phpunit/revision_txt/138274875.txt
diff --git a/tests/phpunit/includes/revision_txt/138275105.txt b/tests/phpunit/revision_txt/138275105.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/138275105.txt
rename to tests/phpunit/revision_txt/138275105.txt
diff --git a/tests/phpunit/includes/revision_txt/40608353.txt b/tests/phpunit/revision_txt/40608353.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/40608353.txt
rename to tests/phpunit/revision_txt/40608353.txt
diff --git a/tests/phpunit/includes/revision_txt/40610292.txt b/tests/phpunit/revision_txt/40610292.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/40610292.txt
rename to tests/phpunit/revision_txt/40610292.txt
diff --git a/tests/phpunit/includes/revision_txt/637637213.txt b/tests/phpunit/revision_txt/637637213.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/637637213.txt
rename to tests/phpunit/revision_txt/637637213.txt
diff --git a/tests/phpunit/includes/revision_txt/637638133.txt b/tests/phpunit/revision_txt/637638133.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/637638133.txt
rename to tests/phpunit/revision_txt/637638133.txt
diff --git a/tests/phpunit/includes/revision_txt/646790570.txt b/tests/phpunit/revision_txt/646790570.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/646790570.txt
rename to tests/phpunit/revision_txt/646790570.txt
diff --git a/tests/phpunit/includes/revision_txt/646792804.txt b/tests/phpunit/revision_txt/646792804.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/646792804.txt
rename to tests/phpunit/revision_txt/646792804.txt
diff --git a/tests/phpunit/includes/revision_txt/647258025.txt b/tests/phpunit/revision_txt/647258025.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/647258025.txt
rename to tests/phpunit/revision_txt/647258025.txt
diff --git a/tests/phpunit/includes/revision_txt/647260329.txt b/tests/phpunit/revision_txt/647260329.txt
similarity index 100%
rename from tests/phpunit/includes/revision_txt/647260329.txt
rename to tests/phpunit/revision_txt/647260329.txt
diff --git a/tests/phpunit/includes/revision_txt/README b/tests/phpunit/revision_txt/README
similarity index 100%
rename from tests/phpunit/includes/revision_txt/README
rename to tests/phpunit/revision_txt/README