diff --git a/.upgrade.yml b/.upgrade.yml
index e9039eb2..4038b207 100644
--- a/.upgrade.yml
+++ b/.upgrade.yml
@@ -76,5 +76,75 @@ mappings:
   URLSegmentField: SilverStripe\CMS\Forms\SiteTreeURLSegmentField
   CMSPagesController_Tools_ss: SilverStripe\CMS\Controllers\CMSPagesController
   LeftAndMain: SilverStripe\Admin\LeftAndMain
+  CMSBatchActionsTest: SilverStripe\CMS\Tests\CMSBatchActionsTest
+  CMSMainTest: SilverStripe\CMS\Tests\CMSMainTest
+  CMSMainTest_ClassA: SilverStripe\CMS\Tests\CMSMainTest_ClassA
+  CMSMainTest_ClassB: SilverStripe\CMS\Tests\CMSMainTest_ClassB
+  CMSMainTest_HiddenClass: SilverStripe\CMS\Tests\CMSMainTest_HiddenClass
+  CMSMainTest_NotRoot: SilverStripe\CMS\Tests\CMSMainTest_NotRoot
+  CMSPageHistoryControllerTest: SilverStripe\CMS\Tests\CMSPageHistoryControllerTest
+  CMSSiteTreeFilterTest: SilverStripe\CMS\Tests\CMSSiteTreeFilterTest
+  CMSTreeTest: SilverStripe\CMS\Tests\CMSTreeTest
+  ContentControllerPermissionsTest: SilverStripe\CMS\Tests\ContentControllerPermissionsTest
+  ContentControllerSearchExtensionTest: SilverStripe\CMS\Tests\ContentControllerSearchExtensionTest
+  ContentControllerTest: SilverStripe\CMS\Tests\ContentControllerTest
+  ContentControllerTest_Page: SilverStripe\CMS\Tests\ContentControllerTest_Page
+  ContentControllerTest_PageController: SilverStripe\CMS\Tests\ContentControllerTest_PageController
+  ContentControllerTestPage: SilverStripe\CMS\Tests\ContentControllerTestPage
+  ContentControllerTestPageController: SilverStripe\CMS\Tests\ContentControllerTestPageController
+  ContentControllerTestPageWithoutController: SilverStripe\CMS\Tests\ContentControllerTestPageWithoutController
+  ModelAsControllerTest: SilverStripe\CMS\Tests\ModelAsControllerTest
+  RootURLControllerTest: SilverStripe\CMS\Tests\RootURLControllerTest
+  SilverStripeNavigatorTest: SilverStripe\CMS\Tests\SilverStripeNavigatorTest
+  SilverStripeNavigatorTest_ProtectedTestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_ProtectedTestItem
+  SilverStripeNavigatorTest_TestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_TestItem
+  FileLinkTrackingTest: SilverStripe\CMS\Tests\FileLinkTrackingTest
+  RedirectorPageTest: SilverStripe\CMS\Tests\RedirectorPageTest
+  RedirectorPageTest_RedirectExtension: SilverStripe\CMS\Tests\RedirectorPageTest_RedirectExtension
+  SiteTreeActionsTest: SilverStripe\CMS\Tests\SiteTreeActionsTest
+  SiteTreeActionsTest_Page: SilverStripe\CMS\Tests\SiteTreeActionsTest_Page
+  SiteTreeBacklinksTest: SilverStripe\CMS\Tests\SiteTreeBacklinksTest
+  SiteTreeBacklinksTest_DOD: SilverStripe\CMS\Tests\SiteTreeBacklinksTest_DOD
+  SiteTreeBrokenLinksTest: SilverStripe\CMS\Tests\SiteTreeBrokenLinksTest
+  SiteTreeHTMLEditorFieldTest: SilverStripe\CMS\Tests\SiteTreeHTMLEditorFieldTest
+  SiteTreeLinkTrackingTest: SilverStripe\CMS\Tests\SiteTreeLinkTrackingTest
+  SiteTreePermissionsTest: SilverStripe\CMS\Tests\SiteTreePermissionsTest
+  SiteTreeTest: SilverStripe\CMS\Tests\SiteTreeTest
+  SiteTreeTest_AdminDenied: SilverStripe\CMS\Tests\SiteTreeTest_AdminDenied
+  SiteTreeTest_AdminDeniedExtension: SilverStripe\CMS\Tests\SiteTreeTest_AdminDeniedExtension
+  SiteTreeTest_ClassA: SilverStripe\CMS\Tests\SiteTreeTest_ClassA
+  SiteTreeTest_ClassB: SilverStripe\CMS\Tests\SiteTreeTest_ClassB
+  SiteTreeTest_ClassC: SilverStripe\CMS\Tests\SiteTreeTest_ClassC
+  SiteTreeTest_ClassCext: SilverStripe\CMS\Tests\SiteTreeTest_ClassCext
+  SiteTreeTest_ClassD: SilverStripe\CMS\Tests\SiteTreeTest_ClassD
+  SiteTreeTest_ClassE: SilverStripe\CMS\Tests\SiteTreeTest_ClassE
+  SiteTreeTest_Conflicted: SilverStripe\CMS\Tests\SiteTreeTest_Conflicted
+  SiteTreeTest_ConflictedController: SilverStripe\CMS\Tests\SiteTreeTest_ConflictedController
+  SiteTreeTest_DataObject: SilverStripe\CMS\Tests\SiteTreeTest_DataObject
+  SiteTreeTest_Extension: SilverStripe\CMS\Tests\SiteTreeTest_Extension
+  SiteTreeTest_ExtensionA: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionA
+  SiteTreeTest_ExtensionB: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionB
+  SiteTreeTest_LegacyControllerName: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName
+  SiteTreeTest_LegacyControllerName_Controller: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName_Controller
+  SiteTreeTest_NotRoot: SilverStripe\CMS\Tests\SiteTreeTest_NotRoot
+  SiteTreeTest_NullHtmlCleaner: SilverStripe\CMS\Tests\SiteTreeTest_NullHtmlCleaner
+  SiteTreeTest_PageNode: SilverStripe\CMS\Tests\SiteTreeTest_PageNode
+  SiteTreeTest_PageNodeController: SilverStripe\CMS\Tests\SiteTreeTest_PageNodeController
+  SiteTreeTest_StageStatusInherit: SilverStripe\CMS\Tests\SiteTreeTest_StageStatusInherit
+  VirtualPageTest: SilverStripe\CMS\Tests\VirtualPageTest
+  VirtualPageTest_ClassA: SilverStripe\CMS\Tests\VirtualPageTest_ClassA
+  VirtualPageTest_ClassAController: SilverStripe\CMS\Tests\VirtualPageTest_ClassAController
+  VirtualPageTest_ClassB: SilverStripe\CMS\Tests\VirtualPageTest_ClassB
+  VirtualPageTest_ClassC: SilverStripe\CMS\Tests\VirtualPageTest_ClassC
+  VirtualPageTest_NotRoot: SilverStripe\CMS\Tests\VirtualPageTest_NotRoot
+  VirtualPageTest_PageExtension: SilverStripe\CMS\Tests\VirtualPageTest_PageExtension
+  VirtualPageTest_PageWithAllowedChildren: SilverStripe\CMS\Tests\VirtualPageTest_PageWithAllowedChildren
+  VirtualPageTest_TestDBField: SilverStripe\CMS\Tests\VirtualPageTest_TestDBField
+  VirtualPageTest_VirtualPageSub: SilverStripe\CMS\Tests\VirtualPageTest_VirtualPageSub
+  CmsReportsTest: SilverStripe\CMS\Tests\CmsReportsTest
+  CMSMainSearchFormTest: SilverStripe\CMS\Tests\CMSMainSearchFormTest
+  ZZZSearchFormTest: SilverStripe\CMS\Tests\ZZZSearchFormTest
+  MigrateSiteTreeLinkingTaskTest: SilverStripe\CMS\Tests\MigrateSiteTreeLinkingTaskTest
+  RemoveOrphanedPagesTaskTest: SilverStripe\CMS\Tests\RemoveOrphanedPagesTaskTest
 excludedPaths:
   - '*/_config/legacy.yml'
diff --git a/tests/php/Controllers/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php
index 8196f18b..eb4ef570 100644
--- a/tests/php/Controllers/CMSBatchActionsTest.php
+++ b/tests/php/Controllers/CMSBatchActionsTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Archive;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\CMS\BatchActions\CMSBatchAction_Publish;
@@ -8,6 +11,8 @@ use SilverStripe\CMS\BatchActions\CMSBatchAction_Restore;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Dev\SapphireTest;
 
+
+
 /**
  * Tests CMS Specific subclasses of {@see CMSBatchAction}
  */
diff --git a/tests/php/Controllers/CMSMainTest.php b/tests/php/Controllers/CMSMainTest.php
index ef8c88e2..b9f90ee2 100644
--- a/tests/php/Controllers/CMSMainTest.php
+++ b/tests/php/Controllers/CMSMainTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use Psr\SimpleCache\CacheInterface;
 use SilverStripe\Admin\CMSBatchActionHandler;
 use SilverStripe\CMS\Controllers\CMSMain;
@@ -21,6 +24,8 @@ use SilverStripe\ORM\ValidationException;
 use SilverStripe\Security\Security;
 use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Versioned\Versioned;
+use Page;
+
 
 /**
  * @package cms
diff --git a/tests/php/Controllers/CMSMainTest_ClassA.php b/tests/php/Controllers/CMSMainTest_ClassA.php
index afbdb743..b5751557 100644
--- a/tests/php/Controllers/CMSMainTest_ClassA.php
+++ b/tests/php/Controllers/CMSMainTest_ClassA.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\ValidationException;
+use Page;
+
 
 class CMSMainTest_ClassA extends Page implements TestOnly
 {
diff --git a/tests/php/Controllers/CMSMainTest_ClassB.php b/tests/php/Controllers/CMSMainTest_ClassB.php
index 9bd88aa4..f31d9c99 100644
--- a/tests/php/Controllers/CMSMainTest_ClassB.php
+++ b/tests/php/Controllers/CMSMainTest_ClassB.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\ValidationException;
+use Page;
+
 
 class CMSMainTest_ClassB extends Page implements TestOnly
 {
diff --git a/tests/php/Controllers/CMSMainTest_HiddenClass.php b/tests/php/Controllers/CMSMainTest_HiddenClass.php
index 4e21c759..ad4afbc5 100644
--- a/tests/php/Controllers/CMSMainTest_HiddenClass.php
+++ b/tests/php/Controllers/CMSMainTest_HiddenClass.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\HiddenClass;
+use Page;
+
 
 class CMSMainTest_HiddenClass extends Page implements TestOnly, HiddenClass
 {
diff --git a/tests/php/Controllers/CMSMainTest_NotRoot.php b/tests/php/Controllers/CMSMainTest_NotRoot.php
index 2fd46d37..2259a67b 100644
--- a/tests/php/Controllers/CMSMainTest_NotRoot.php
+++ b/tests/php/Controllers/CMSMainTest_NotRoot.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class CMSMainTest_NotRoot extends Page implements TestOnly
 {
diff --git a/tests/php/Controllers/CMSPageHistoryControllerTest.php b/tests/php/Controllers/CMSPageHistoryControllerTest.php
index de06c3a7..7738b9e7 100755
--- a/tests/php/Controllers/CMSPageHistoryControllerTest.php
+++ b/tests/php/Controllers/CMSPageHistoryControllerTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Control\Controller;
 use SilverStripe\Forms\FieldGroup;
 use SilverStripe\Forms\FieldList;
@@ -9,6 +12,8 @@ use SilverStripe\Forms\TextField;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\CMS\Controllers\CMSPageHistoryController;
 use SilverStripe\Dev\FunctionalTest;
+use Page;
+
 
 /**
  * @package cms
diff --git a/tests/php/Controllers/CMSSiteTreeFilterTest.php b/tests/php/Controllers/CMSSiteTreeFilterTest.php
index 0459087e..35f2dc54 100644
--- a/tests/php/Controllers/CMSSiteTreeFilterTest.php
+++ b/tests/php/Controllers/CMSSiteTreeFilterTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search;
@@ -10,6 +13,8 @@ use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusRemovedFromDraftPages;
 use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDeletedPages;
 use SilverStripe\Dev\SapphireTest;
 
+
+
 class CMSSiteTreeFilterTest extends SapphireTest
 {
 
diff --git a/tests/php/Controllers/CMSTreeTest.php b/tests/php/Controllers/CMSTreeTest.php
index a8f8e3da..477e55f5 100644
--- a/tests/php/Controllers/CMSTreeTest.php
+++ b/tests/php/Controllers/CMSTreeTest.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\ORM\DataObject;
 
+
+
 /**
  * Tests for tree-operations refactored out of LeftAndMain
  */
diff --git a/tests/php/Controllers/ContentControllerPermissionsTest.php b/tests/php/Controllers/ContentControllerPermissionsTest.php
index db70edf3..a20f14ec 100644
--- a/tests/php/Controllers/ContentControllerPermissionsTest.php
+++ b/tests/php/Controllers/ContentControllerPermissionsTest.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\FunctionalTest;
+use Page;
+
 
 /**
  * @package cms
diff --git a/tests/php/Controllers/ContentControllerSearchExtensionTest.php b/tests/php/Controllers/ContentControllerSearchExtensionTest.php
index 568f6e3f..007054d2 100644
--- a/tests/php/Controllers/ContentControllerSearchExtensionTest.php
+++ b/tests/php/Controllers/ContentControllerSearchExtensionTest.php
@@ -1,11 +1,16 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Assets\File;
 use SilverStripe\CMS\Controllers\ContentController;
 use SilverStripe\CMS\Search\ContentControllerSearchExtension;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\Search\FulltextSearchable;
 use SilverStripe\Versioned\Versioned;
+use Page;
+
 
 class ContentControllerSearchExtensionTest extends SapphireTest
 {
diff --git a/tests/php/Controllers/ContentControllerTest.php b/tests/php/Controllers/ContentControllerTest.php
index 75caf2db..e95e543b 100755
--- a/tests/php/Controllers/ContentControllerTest.php
+++ b/tests/php/Controllers/ContentControllerTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Controllers\ContentController;
 use SilverStripe\CMS\Controllers\RootURLController;
 use SilverStripe\CMS\Model\SiteTree;
@@ -8,6 +11,8 @@ use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Versioned\Versioned;
+use Page;
+
 
 /**
  * @package cms
diff --git a/tests/php/Controllers/ContentControllerTestPage.php b/tests/php/Controllers/ContentControllerTestPage.php
index 7208516a..70b28c75 100644
--- a/tests/php/Controllers/ContentControllerTestPage.php
+++ b/tests/php/Controllers/ContentControllerTestPage.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class ContentControllerTestPage extends Page implements TestOnly
 {
diff --git a/tests/php/Controllers/ContentControllerTestPageController.php b/tests/php/Controllers/ContentControllerTestPageController.php
index 3734e812..a0804e48 100644
--- a/tests/php/Controllers/ContentControllerTestPageController.php
+++ b/tests/php/Controllers/ContentControllerTestPageController.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use PageController;
+
 
 class ContentControllerTestPageController extends PageController implements TestOnly
 {
diff --git a/tests/php/Controllers/ContentControllerTestPageWithoutController.php b/tests/php/Controllers/ContentControllerTestPageWithoutController.php
index 3da60800..146fedfd 100644
--- a/tests/php/Controllers/ContentControllerTestPageWithoutController.php
+++ b/tests/php/Controllers/ContentControllerTestPageWithoutController.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class ContentControllerTestPageWithoutController extends Page implements TestOnly
 {
diff --git a/tests/php/Controllers/ContentControllerTest_Page.php b/tests/php/Controllers/ContentControllerTest_Page.php
index 88f54263..b53a01ae 100644
--- a/tests/php/Controllers/ContentControllerTest_Page.php
+++ b/tests/php/Controllers/ContentControllerTest_Page.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class ContentControllerTest_Page extends Page implements TestOnly
 {
diff --git a/tests/php/Controllers/ContentControllerTest_PageController.php b/tests/php/Controllers/ContentControllerTest_PageController.php
index 0881fc3c..04684f0d 100644
--- a/tests/php/Controllers/ContentControllerTest_PageController.php
+++ b/tests/php/Controllers/ContentControllerTest_PageController.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use PageController;
+
 
 class ContentControllerTest_PageController extends PageController implements TestOnly
 {
diff --git a/tests/php/Controllers/ModelAsControllerTest.php b/tests/php/Controllers/ModelAsControllerTest.php
index 79b44d4b..4e12ab65 100644
--- a/tests/php/Controllers/ModelAsControllerTest.php
+++ b/tests/php/Controllers/ModelAsControllerTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\CMS\Controllers\OldPageRedirector;
@@ -8,6 +11,8 @@ use SilverStripe\Core\Config\Config;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\Controller;
 use SilverStripe\Dev\FunctionalTest;
+use Page;
+
 
 /**
  * @package cms
diff --git a/tests/php/Controllers/RootURLControllerTest.php b/tests/php/Controllers/RootURLControllerTest.php
index 61a3d64d..661e9fa7 100644
--- a/tests/php/Controllers/RootURLControllerTest.php
+++ b/tests/php/Controllers/RootURLControllerTest.php
@@ -1,10 +1,15 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\CMS\Controllers\RootURLController;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\SapphireTest;
 
+
+
 /**
  * @package cms
  * @subpackage tests
diff --git a/tests/php/Controllers/SilverStripeNavigatorTest.php b/tests/php/Controllers/SilverStripeNavigatorTest.php
index 5dc338e0..3ee25bab 100644
--- a/tests/php/Controllers/SilverStripeNavigatorTest.php
+++ b/tests/php/Controllers/SilverStripeNavigatorTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_StageLink;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
@@ -9,6 +12,8 @@ use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Security\Security;
 
+
+
 /**
  * @package cms
  * @subpackage tests
diff --git a/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php
index c33122a8..a95d407a 100644
--- a/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php
+++ b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php
@@ -1,9 +1,14 @@
 <?php
+
+namespace SilverStripe\CMS\Tests;
+
 use SilverStripe\CMS\Controllers\SilverStripeNavigatorItem;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
 
+
+
 class SilverStripeNavigatorTest_ProtectedTestItem extends SilverStripeNavigatorItem implements TestOnly
 {
 
diff --git a/tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php
index a54211d3..5a97f4b1 100644
--- a/tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php
+++ b/tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Controllers\SilverStripeNavigatorItem;
 use SilverStripe\Dev\TestOnly;
 
+
+
 class SilverStripeNavigatorTest_TestItem extends SilverStripeNavigatorItem implements TestOnly
 {
     public function getTitle()
diff --git a/tests/php/Model/FileLinkTrackingTest.php b/tests/php/Model/FileLinkTrackingTest.php
index a11a4efc..9209f564 100644
--- a/tests/php/Model/FileLinkTrackingTest.php
+++ b/tests/php/Model/FileLinkTrackingTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Assets\Folder;
 use SilverStripe\Assets\Image;
 use SilverStripe\Versioned\Versioned;
@@ -9,6 +12,8 @@ use SilverStripe\Assets\File;
 use SilverStripe\Assets\Filesystem;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
+use Page;
+
 
 /**
  * Tests link tracking to files and images.
diff --git a/tests/php/Model/RedirectorPageTest.php b/tests/php/Model/RedirectorPageTest.php
index 676489fb..c6a37990 100644
--- a/tests/php/Model/RedirectorPageTest.php
+++ b/tests/php/Model/RedirectorPageTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\CMS\Model\RedirectorPageController;
 use SilverStripe\Control\Director;
@@ -7,6 +10,8 @@ use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Core\Extension;
 use SilverStripe\Dev\TestOnly;
 
+
+
 class RedirectorPageTest extends FunctionalTest
 {
     protected static $fixture_file = 'RedirectorPageTest.yml';
diff --git a/tests/php/Model/RedirectorPageTest_RedirectExtension.php b/tests/php/Model/RedirectorPageTest_RedirectExtension.php
index 58479a6c..c2bb79ce 100644
--- a/tests/php/Model/RedirectorPageTest_RedirectExtension.php
+++ b/tests/php/Model/RedirectorPageTest_RedirectExtension.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Core\Extension;
 use SilverStripe\Dev\TestOnly;
 
+
+
 class RedirectorPageTest_RedirectExtension extends Extension implements TestOnly
 {
 
diff --git a/tests/php/Model/SiteTreeActionsTest.php b/tests/php/Model/SiteTreeActionsTest.php
index 730137a0..8484f251 100644
--- a/tests/php/Model/SiteTreeActionsTest.php
+++ b/tests/php/Model/SiteTreeActionsTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Security\Security;
 use SilverStripe\Versioned\Versioned;
@@ -8,6 +11,8 @@ use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 /**
  * Possible actions:
diff --git a/tests/php/Model/SiteTreeActionsTest_Page.php b/tests/php/Model/SiteTreeActionsTest_Page.php
index 6ea08b5e..55c857a1 100644
--- a/tests/php/Model/SiteTreeActionsTest_Page.php
+++ b/tests/php/Model/SiteTreeActionsTest_Page.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Security\Permission;
+use Page;
+
 
 class SiteTreeActionsTest_Page extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeBacklinksTest.php b/tests/php/Model/SiteTreeBacklinksTest.php
index 0aad6b17..ebfa7e3c 100644
--- a/tests/php/Model/SiteTreeBacklinksTest.php
+++ b/tests/php/Model/SiteTreeBacklinksTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\ORM\DataExtension;
@@ -10,6 +13,8 @@ use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
 use SilverStripe\Dev\TestOnly;
 
+
+
 /**
  * Tests {@see SiteTreeLinkTracking} broken links feature: LinkTracking
  */
diff --git a/tests/php/Model/SiteTreeBacklinksTest_DOD.php b/tests/php/Model/SiteTreeBacklinksTest_DOD.php
index 1319a4e2..b7b3fefe 100644
--- a/tests/php/Model/SiteTreeBacklinksTest_DOD.php
+++ b/tests/php/Model/SiteTreeBacklinksTest_DOD.php
@@ -1,10 +1,15 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
 use SilverStripe\ORM\DataExtension;
 
+
+
 class SiteTreeBacklinksTest_DOD extends DataExtension implements TestOnly
 {
     private static $db = array(
diff --git a/tests/php/Model/SiteTreeBrokenLinksTest.php b/tests/php/Model/SiteTreeBrokenLinksTest.php
index 179b3a92..eedd9730 100644
--- a/tests/php/Model/SiteTreeBrokenLinksTest.php
+++ b/tests/php/Model/SiteTreeBrokenLinksTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\ORM\DataObject;
@@ -9,6 +12,8 @@ use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\Assets\File;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
+use Page;
+
 
 /**
  * Tests {@see SiteTreeLinkTracking} broken links feature: LinkTracking
diff --git a/tests/php/Model/SiteTreeHTMLEditorFieldTest.php b/tests/php/Model/SiteTreeHTMLEditorFieldTest.php
index 3809f683..5a87c326 100644
--- a/tests/php/Model/SiteTreeHTMLEditorFieldTest.php
+++ b/tests/php/Model/SiteTreeHTMLEditorFieldTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Assets\File;
 use SilverStripe\Assets\Filesystem;
@@ -8,6 +11,8 @@ use SilverStripe\Dev\CSSContentParser;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore;
 
+
+
 class SiteTreeHTMLEditorFieldTest extends FunctionalTest
 {
     protected static $fixture_file = 'SiteTreeHTMLEditorFieldTest.yml';
diff --git a/tests/php/Model/SiteTreeLinkTrackingTest.php b/tests/php/Model/SiteTreeLinkTrackingTest.php
index d16831ef..5eeb34c0 100644
--- a/tests/php/Model/SiteTreeLinkTrackingTest.php
+++ b/tests/php/Model/SiteTreeLinkTrackingTest.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTreeLinkTracking_Parser;
 use SilverStripe\Assets\File;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\View\Parsers\HTMLValue;
+use Page;
+
 
 class SiteTreeLinkTrackingTest extends SapphireTest
 {
diff --git a/tests/php/Model/SiteTreePermissionsTest.php b/tests/php/Model/SiteTreePermissionsTest.php
index 2efe8739..4b16b63d 100644
--- a/tests/php/Model/SiteTreePermissionsTest.php
+++ b/tests/php/Model/SiteTreePermissionsTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Security\Group;
 use SilverStripe\Security\Security;
 use SilverStripe\SiteConfig\SiteConfig;
@@ -10,6 +13,8 @@ use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\FunctionalTest;
 
+
+
 /**
  * @package cms
  * @subpackage tests
diff --git a/tests/php/Model/SiteTreeTest.php b/tests/php/Model/SiteTreeTest.php
index c74c91aa..d1e2b55b 100644
--- a/tests/php/Model/SiteTreeTest.php
+++ b/tests/php/Model/SiteTreeTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\CMS\Model\VirtualPage;
 use SilverStripe\Control\ContentNegotiator;
@@ -28,6 +31,9 @@ use SilverStripe\Dev\TestOnly;
 use SilverStripe\View\Parsers\HTMLCleaner;
 use SilverStripe\View\Parsers\Diff;
 use SilverStripe\View\Parsers\URLSegmentFilter;
+use Page;
+use ReflectionMethod;
+
 
 /**
  * @package cms
diff --git a/tests/php/Model/SiteTreeTest_AdminDenied.php b/tests/php/Model/SiteTreeTest_AdminDenied.php
index 3b6de533..450cb470 100644
--- a/tests/php/Model/SiteTreeTest_AdminDenied.php
+++ b/tests/php/Model/SiteTreeTest_AdminDenied.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_AdminDenied extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_AdminDeniedExtension.php b/tests/php/Model/SiteTreeTest_AdminDeniedExtension.php
index 38b03336..f8614258 100644
--- a/tests/php/Model/SiteTreeTest_AdminDeniedExtension.php
+++ b/tests/php/Model/SiteTreeTest_AdminDeniedExtension.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataExtension;
 
+
+
 /**
  * An extension that can even deny actions to admins
  */
diff --git a/tests/php/Model/SiteTreeTest_ClassA.php b/tests/php/Model/SiteTreeTest_ClassA.php
index d8f0bfc0..a14e10bf 100644
--- a/tests/php/Model/SiteTreeTest_ClassA.php
+++ b/tests/php/Model/SiteTreeTest_ClassA.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_ClassA extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_ClassB.php b/tests/php/Model/SiteTreeTest_ClassB.php
index bdbd3940..5877a5ae 100644
--- a/tests/php/Model/SiteTreeTest_ClassB.php
+++ b/tests/php/Model/SiteTreeTest_ClassB.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_ClassB extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_ClassC.php b/tests/php/Model/SiteTreeTest_ClassC.php
index ba0aa6ab..e62d9a91 100644
--- a/tests/php/Model/SiteTreeTest_ClassC.php
+++ b/tests/php/Model/SiteTreeTest_ClassC.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_ClassC extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_ClassCext.php b/tests/php/Model/SiteTreeTest_ClassCext.php
index 3ea6a370..730be5d4 100644
--- a/tests/php/Model/SiteTreeTest_ClassCext.php
+++ b/tests/php/Model/SiteTreeTest_ClassCext.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 
+
+
 class SiteTreeTest_ClassCext extends SiteTreeTest_ClassC implements TestOnly
 {
     // Override SiteTreeTest_ClassC definitions
diff --git a/tests/php/Model/SiteTreeTest_ClassD.php b/tests/php/Model/SiteTreeTest_ClassD.php
index 03dd8571..eed7c447 100644
--- a/tests/php/Model/SiteTreeTest_ClassD.php
+++ b/tests/php/Model/SiteTreeTest_ClassD.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_ClassD extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_ClassE.php b/tests/php/Model/SiteTreeTest_ClassE.php
index 2fc7d40d..a3159461 100644
--- a/tests/php/Model/SiteTreeTest_ClassE.php
+++ b/tests/php/Model/SiteTreeTest_ClassE.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\HiddenClass;
+use Page;
+
 
 class SiteTreeTest_ClassE extends Page implements TestOnly, HiddenClass
 {
diff --git a/tests/php/Model/SiteTreeTest_Conflicted.php b/tests/php/Model/SiteTreeTest_Conflicted.php
index 071cb662..06fb2d5c 100644
--- a/tests/php/Model/SiteTreeTest_Conflicted.php
+++ b/tests/php/Model/SiteTreeTest_Conflicted.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_Conflicted extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_ConflictedController.php b/tests/php/Model/SiteTreeTest_ConflictedController.php
index 64880b76..ed95ff5f 100644
--- a/tests/php/Model/SiteTreeTest_ConflictedController.php
+++ b/tests/php/Model/SiteTreeTest_ConflictedController.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use PageController;
+
 
 class SiteTreeTest_ConflictedController extends PageController implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_DataObject.php b/tests/php/Model/SiteTreeTest_DataObject.php
index 29ca4080..e96e51ba 100644
--- a/tests/php/Model/SiteTreeTest_DataObject.php
+++ b/tests/php/Model/SiteTreeTest_DataObject.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 
+
+
 /**
  * Class SiteTreeTest_DataObject
  *
diff --git a/tests/php/Model/SiteTreeTest_Extension.php b/tests/php/Model/SiteTreeTest_Extension.php
index 1f79afa5..60dd0c90 100644
--- a/tests/php/Model/SiteTreeTest_Extension.php
+++ b/tests/php/Model/SiteTreeTest_Extension.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataExtension;
 
+
+
 class SiteTreeTest_Extension extends DataExtension implements TestOnly
 {
     public function augmentValidURLSegment()
diff --git a/tests/php/Model/SiteTreeTest_ExtensionA.php b/tests/php/Model/SiteTreeTest_ExtensionA.php
index 00354149..05b1876f 100644
--- a/tests/php/Model/SiteTreeTest_ExtensionA.php
+++ b/tests/php/Model/SiteTreeTest_ExtensionA.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTreeExtension;
 use SilverStripe\Dev\TestOnly;
 
+
+
 class SiteTreeTest_ExtensionA extends SiteTreeExtension implements TestOnly
 {
     public static $can_publish = true;
diff --git a/tests/php/Model/SiteTreeTest_ExtensionB.php b/tests/php/Model/SiteTreeTest_ExtensionB.php
index 16a9496f..4957e037 100644
--- a/tests/php/Model/SiteTreeTest_ExtensionB.php
+++ b/tests/php/Model/SiteTreeTest_ExtensionB.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTreeExtension;
 use SilverStripe\Dev\TestOnly;
 
+
+
 class SiteTreeTest_ExtensionB extends SiteTreeExtension implements TestOnly
 {
     public static $can_publish = true;
diff --git a/tests/php/Model/SiteTreeTest_LegacyControllerName.php b/tests/php/Model/SiteTreeTest_LegacyControllerName.php
index c1495b72..5f5f82d1 100644
--- a/tests/php/Model/SiteTreeTest_LegacyControllerName.php
+++ b/tests/php/Model/SiteTreeTest_LegacyControllerName.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 /**
  * An empty SiteTree instance with a controller to test that legacy controller names can still be loaded
diff --git a/tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php b/tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php
index a7695d0a..a2964c5c 100644
--- a/tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php
+++ b/tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use PageController;
+
 
 class SiteTreeTest_LegacyControllerName_Controller extends PageController implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_NotRoot.php b/tests/php/Model/SiteTreeTest_NotRoot.php
index 42396f60..404bc525 100644
--- a/tests/php/Model/SiteTreeTest_NotRoot.php
+++ b/tests/php/Model/SiteTreeTest_NotRoot.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_NotRoot extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_NullHtmlCleaner.php b/tests/php/Model/SiteTreeTest_NullHtmlCleaner.php
index 164d0e1b..718cb0cd 100644
--- a/tests/php/Model/SiteTreeTest_NullHtmlCleaner.php
+++ b/tests/php/Model/SiteTreeTest_NullHtmlCleaner.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\View\Parsers\HTMLCleaner;
 
+
+
 class SiteTreeTest_NullHtmlCleaner extends HTMLCleaner implements TestOnly
 {
     public function cleanHTML($html)
diff --git a/tests/php/Model/SiteTreeTest_PageNode.php b/tests/php/Model/SiteTreeTest_PageNode.php
index 22623328..f3000ac6 100644
--- a/tests/php/Model/SiteTreeTest_PageNode.php
+++ b/tests/php/Model/SiteTreeTest_PageNode.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class SiteTreeTest_PageNode extends Page implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_PageNodeController.php b/tests/php/Model/SiteTreeTest_PageNodeController.php
index 0f76d8c1..192f61fc 100644
--- a/tests/php/Model/SiteTreeTest_PageNodeController.php
+++ b/tests/php/Model/SiteTreeTest_PageNodeController.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use PageController;
+
 
 class SiteTreeTest_PageNodeController extends PageController implements TestOnly
 {
diff --git a/tests/php/Model/SiteTreeTest_StageStatusInherit.php b/tests/php/Model/SiteTreeTest_StageStatusInherit.php
index 2bc88766..0daf4a6e 100644
--- a/tests/php/Model/SiteTreeTest_StageStatusInherit.php
+++ b/tests/php/Model/SiteTreeTest_StageStatusInherit.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Dev\TestOnly;
 
+
+
 class SiteTreeTest_StageStatusInherit extends SiteTree implements TestOnly
 {
     public function getStatusFlags($cached = true)
diff --git a/tests/php/Model/VirtualPageTest.php b/tests/php/Model/VirtualPageTest.php
index 9b7c3253..ac134c5e 100644
--- a/tests/php/Model/VirtualPageTest.php
+++ b/tests/php/Model/VirtualPageTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+use Page;
 use SilverStripe\CMS\Controllers\ModelAsController;
 use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\CMS\Model\SiteTree;
@@ -7,9 +10,7 @@ use SilverStripe\CMS\Model\VirtualPage;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\DB;
 use SilverStripe\ORM\ValidationException;
-use SilverStripe\Security\Member;
 use SilverStripe\Versioned\Versioned;
 
 class VirtualPageTest extends FunctionalTest
diff --git a/tests/php/Model/VirtualPageTest_ClassA.php b/tests/php/Model/VirtualPageTest_ClassA.php
index 53331e04..6b20e998 100644
--- a/tests/php/Model/VirtualPageTest_ClassA.php
+++ b/tests/php/Model/VirtualPageTest_ClassA.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class VirtualPageTest_ClassA extends Page implements TestOnly
 {
diff --git a/tests/php/Model/VirtualPageTest_ClassAController.php b/tests/php/Model/VirtualPageTest_ClassAController.php
index 986e44be..3a386e9a 100644
--- a/tests/php/Model/VirtualPageTest_ClassAController.php
+++ b/tests/php/Model/VirtualPageTest_ClassAController.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use PageController;
+
 
 class VirtualPageTest_ClassAController extends PageController implements TestOnly
 {
diff --git a/tests/php/Model/VirtualPageTest_ClassB.php b/tests/php/Model/VirtualPageTest_ClassB.php
index d29fcc14..ce833d16 100644
--- a/tests/php/Model/VirtualPageTest_ClassB.php
+++ b/tests/php/Model/VirtualPageTest_ClassB.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class VirtualPageTest_ClassB extends Page implements TestOnly
 {
diff --git a/tests/php/Model/VirtualPageTest_ClassC.php b/tests/php/Model/VirtualPageTest_ClassC.php
index 520b4688..0680c742 100644
--- a/tests/php/Model/VirtualPageTest_ClassC.php
+++ b/tests/php/Model/VirtualPageTest_ClassC.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class VirtualPageTest_ClassC extends Page implements TestOnly
 {
diff --git a/tests/php/Model/VirtualPageTest_NotRoot.php b/tests/php/Model/VirtualPageTest_NotRoot.php
index 781f0fa4..426d4c41 100644
--- a/tests/php/Model/VirtualPageTest_NotRoot.php
+++ b/tests/php/Model/VirtualPageTest_NotRoot.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class VirtualPageTest_NotRoot extends Page implements TestOnly
 {
diff --git a/tests/php/Model/VirtualPageTest_PageExtension.php b/tests/php/Model/VirtualPageTest_PageExtension.php
index a3cbcd91..71261973 100644
--- a/tests/php/Model/VirtualPageTest_PageExtension.php
+++ b/tests/php/Model/VirtualPageTest_PageExtension.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataExtension;
 
+
+
 class VirtualPageTest_PageExtension extends DataExtension implements TestOnly
 {
     private static $db = array(
diff --git a/tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php b/tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php
index 43ae8968..4d4c77e0 100644
--- a/tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php
+++ b/tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\VirtualPage;
 use SilverStripe\Dev\TestOnly;
+use Page;
+
 
 class VirtualPageTest_PageWithAllowedChildren extends Page implements TestOnly
 {
diff --git a/tests/php/Model/VirtualPageTest_TestDBField.php b/tests/php/Model/VirtualPageTest_TestDBField.php
index b3cbf483..a2d847e7 100644
--- a/tests/php/Model/VirtualPageTest_TestDBField.php
+++ b/tests/php/Model/VirtualPageTest_TestDBField.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\FieldType\DBVarchar;
 
+
+
 class VirtualPageTest_TestDBField extends DBVarchar implements TestOnly
 {
     public function forTemplate()
diff --git a/tests/php/Model/VirtualPageTest_VirtualPageSub.php b/tests/php/Model/VirtualPageTest_VirtualPageSub.php
index 695eaf6d..5c329549 100644
--- a/tests/php/Model/VirtualPageTest_VirtualPageSub.php
+++ b/tests/php/Model/VirtualPageTest_VirtualPageSub.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\VirtualPage;
 use SilverStripe\Dev\TestOnly;
 
+
+
 class VirtualPageTest_VirtualPageSub extends VirtualPage implements TestOnly
 {
     private static $db = array(
diff --git a/tests/php/Reports/CmsReportsTest.php b/tests/php/Reports/CmsReportsTest.php
index ed54b652..7ff83d92 100644
--- a/tests/php/Reports/CmsReportsTest.php
+++ b/tests/php/Reports/CmsReportsTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBDatetime;
@@ -13,6 +16,8 @@ use SilverStripe\CMS\Reports\BrokenRedirectorPagesReport;
 use SilverStripe\Reports\Report;
 use SilverStripe\Assets\File;
 use SilverStripe\Dev\SapphireTest;
+use Page;
+
 
 /**
  * @package cms
diff --git a/tests/php/Search/CMSMainSearchFormTest.php b/tests/php/Search/CMSMainSearchFormTest.php
index bbe4f81d..91d1793d 100644
--- a/tests/php/Search/CMSMainSearchFormTest.php
+++ b/tests/php/Search/CMSMainSearchFormTest.php
@@ -1,7 +1,12 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Dev\FunctionalTest;
 
+
+
 class CMSMainSearchFormTest extends FunctionalTest
 {
 
diff --git a/tests/php/Search/SearchFormTest.php b/tests/php/Search/SearchFormTest.php
index 7269f570..756ef471 100644
--- a/tests/php/Search/SearchFormTest.php
+++ b/tests/php/Search/SearchFormTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Assets\File;
 use SilverStripe\CMS\Controllers\ModelAsController;
 use SilverStripe\CMS\Model\SiteTree;
@@ -16,6 +19,8 @@ use SilverStripe\ORM\Search\FulltextSearchable;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Security\Member;
 
+
+
 /**
  * @package cms
  * @subpackage testing
diff --git a/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php b/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php
index 71e9fe46..7a9941ac 100644
--- a/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php
+++ b/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\ORM\DataObject;
 use SilverStripe\CMS\Tasks\MigrateSiteTreeLinkingTask;
 use SilverStripe\Dev\SapphireTest;
 
+
+
 /**
  * @package cms
  * @subpackage tests
diff --git a/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php
index 38046c4e..ba935e43 100644
--- a/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php
+++ b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace SilverStripe\CMS\Tests;
+
+
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\Dev\FunctionalTest;
 
+
+
 /**
  * <h2>Fixture tree</h2>
  * <code>