diff --git a/composer.json b/composer.json
index db3ea1e..0593e05 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,8 @@
 		"silverstripe-themes/simple": "3.1.*"
 	},
 	"require-dev": {
-		"phpunit/PHPUnit": "~3.7"
+		"ext-tidy": "*",
+		"phpunit/PHPUnit": "~3.7@stable"
 	},
 	"extra": {
 		"branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8a62266..78d3abf 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -22,6 +22,7 @@
 		<directory>mysite/tests</directory>
 		<directory>cms/tests</directory>
 		<directory>framework/tests</directory>
+		<directory>framework/admin/tests</directory>
 	</testsuite>
 	
 	<listeners>
@@ -33,4 +34,4 @@
 			<group>sanitychecks</group>
 		</exclude>
 	</groups>
-</phpunit>
\ No newline at end of file
+</phpunit>