diff --git a/tests/bootstrap/fixtures/Page.php.fixture b/tests/bootstrap/fixtures/Page.php.fixture
index 4035282d..db560268 100644
--- a/tests/bootstrap/fixtures/Page.php.fixture
+++ b/tests/bootstrap/fixtures/Page.php.fixture
@@ -1,20 +1,8 @@
 <?php
 
 use SilverStripe\CMS\Model\SiteTree;
-use SilverStripe\CMS\Controllers\ContentController;
 
 class Page extends SiteTree
 {
-}
-
-class PageController extends ContentController
-{
-}
-
-/**
- * Deprecated: Used for backwards compatibility between modules
- */
-class Page_Controller extends ContentController
-{
 
 }
diff --git a/tests/bootstrap/fixtures/PageController.php.fixture b/tests/bootstrap/fixtures/PageController.php.fixture
new file mode 100644
index 00000000..80663409
--- /dev/null
+++ b/tests/bootstrap/fixtures/PageController.php.fixture
@@ -0,0 +1,8 @@
+<?php
+
+use SilverStripe\CMS\Controllers\ContentController;
+
+class PageController extends ContentController
+{
+
+}
diff --git a/tests/bootstrap/mysite.php b/tests/bootstrap/mysite.php
index 9914db59..9aa2b031 100644
--- a/tests/bootstrap/mysite.php
+++ b/tests/bootstrap/mysite.php
@@ -2,13 +2,14 @@
 
 // Mock mysite if not installed with silverstripe/installer
 if (defined('BASE_PATH')) {
-	$projectPath = BASE_PATH . '/mysite';
+    $projectPath = BASE_PATH . '/mysite';
 } else {
-	$projectPath = getcwd() . '/mysite';
+    $projectPath = getcwd() . '/mysite';
 }
 if (!is_dir($projectPath)) {
-	mkdir($projectPath, 02775);
-	mkdir($projectPath.'/code', 02775);
-	mkdir($projectPath.'/_config', 02775);
-	copy(__DIR__.'/fixtures/Page.php.fixture', $projectPath . '/code/Page.php');
+    mkdir($projectPath, 02775);
+    mkdir($projectPath . '/code', 02775);
+    mkdir($projectPath . '/_config', 02775);
+    copy(__DIR__ . '/fixtures/Page.php.fixture', $projectPath . '/code/Page.php');
+    copy(__DIR__ . '/fixtures/PageController.php.fixture', $projectPath . '/code/PageController.php');
 }