diff --git a/tests/controller/ContentControllerTest.php b/tests/controller/ContentControllerTest.php
index 8da1bee5..5640efdf 100755
--- a/tests/controller/ContentControllerTest.php
+++ b/tests/controller/ContentControllerTest.php
@@ -183,8 +183,7 @@ class ContentControllerTest extends FunctionalTest {
 			$controller = new ContentController($page);
 			$viewer = $controller->getViewer('test');
 			$templateList = array('ContentControllerTestPage_test', 'Page');
-			$expected = SS_TemplateLoader::instance()->findTemplates($templateList, 'controllertest');
-			$self->assertEquals($expected, $viewer->templates());
+			$self->assertEquals(dirname(__FILE__).'/themes/controllertest/templates/ContentControllerTestPage_test.ss', $viewer->templates()['main']);
 		});
 	}
 
diff --git a/tests/controller/themes/controllertest/ContentControllerTestPageWithoutController.ss b/tests/controller/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss
similarity index 100%
rename from tests/controller/themes/controllertest/ContentControllerTestPageWithoutController.ss
rename to tests/controller/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss
diff --git a/tests/controller/themes/controllertest/ContentControllerTestPage_test.ss b/tests/controller/themes/controllertest/templates/ContentControllerTestPage_test.ss
similarity index 100%
rename from tests/controller/themes/controllertest/ContentControllerTestPage_test.ss
rename to tests/controller/themes/controllertest/templates/ContentControllerTestPage_test.ss
diff --git a/tests/controller/themes/controllertest/Controller.ss b/tests/controller/themes/controllertest/templates/Controller.ss
similarity index 100%
rename from tests/controller/themes/controllertest/Controller.ss
rename to tests/controller/themes/controllertest/templates/Controller.ss
diff --git a/tests/controller/themes/controllertest/Layout/Page.ss b/tests/controller/themes/controllertest/templates/Layout/Page.ss
similarity index 100%
rename from tests/controller/themes/controllertest/Layout/Page.ss
rename to tests/controller/themes/controllertest/templates/Layout/Page.ss
diff --git a/tests/controller/themes/controllertest/Page.ss b/tests/controller/themes/controllertest/templates/Page.ss
similarity index 100%
rename from tests/controller/themes/controllertest/Page.ss
rename to tests/controller/themes/controllertest/templates/Page.ss