diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d0d294e..1232b66 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,37 +1,29 @@
 <!-- 
+	PHPUnit configuration for SilverStripe
+
+	Requires PHPUnit 3.5+
+
 	Usage: 
 	 - "phpunit": Runs all tests in all folders
-	 - "phpunit sapphire/tests/": Run all tests of the sapphire module
-	 - "phpunit sapphire/tests/filesystem": Run all filesystem tests within the sapphire module
-	 - "phpunit sapphire/tests/filesystem/FolderTest.php": Run a single test
+	 - "phpunit framework/tests/": Run all tests of the framework module
+	 - "phpunit framework/tests/filesystem": Run all filesystem tests within the framework module
+	 - "phpunit framework/tests/filesystem/FolderTest.php": Run a single test
 	 - "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug)
 	
-	Further information:
-	- http://www.phpunit.de/manual/current/en/textui.html for more commandline options.
-	- http://github.com/chillu/silverstripe-doc-restructuring/blob/master/master/cms/docs/en/howto/phpunit-configuration.md
-	  for more information on configuration and execution options.
-	- sapphire/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
+	More information:
+	- http://www.phpunit.de/manual/current/en/textui.html
+	- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
 -->
-<phpunit 
-	bootstrap="/sapphire/tests/bootstrap.php"
-	colors="true"
->
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+
 	<testsuite name="Default">
-		<directory>./</directory>
+		<directory>mysite/tests</directory>
+		<directory>cms/tests</directory>
+		<directory>framework/tests</directory>
 	</testsuite>
 	
-	<filter>
-		<blacklist>
-			<directory suffix=".php">sapphire/dev/</directory>
-			<directory suffix=".php">sapphire/thirdparty/</directory>
-			<directory suffix=".php">cms/thirdparty/</directory>
-			<file>sapphire/tests/PhpSyntaxTest.php</file>
-		</blacklist>
-	</filter>
-	
 	<listeners>
-		<listener class="SS_TestListener" file="sapphire/dev/TestListener.php">
-		</listener>
+		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
 	</listeners>
 	
 	<groups>
@@ -39,5 +31,4 @@
 			<group>sanitychecks</group>
 		</exclude>
 	</groups>
-	
 </phpunit>
\ No newline at end of file