diff --git a/phpunit.teamcity.xml b/phpunit.teamcity.xml
index 05490e2b..cac35be4 100644
--- a/phpunit.teamcity.xml
+++ b/phpunit.teamcity.xml
@@ -1,7 +1,7 @@
 <!-- 
 	PHPUnit configuration for SilverStripe
 
-	Requires PHPUnit 3.6+
+	Requires PHPUnit 3.5+
 
 	Usage: 
 	 - "phpunit": Runs all tests in all folders
@@ -16,21 +16,14 @@
 	  for more information on configuration and execution options.
 	- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
 -->
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="false" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
+
 	<testsuite name="Default">
-		<directory>./</directory>
-		<exclude>framework/thirdparty/</exclude>
+		<directory>mysite/tests</directory>
+		<directory>cms/tests</directory>
+		<directory>framework/tests</directory>
 	</testsuite>
 
-	<filter>
-		<blacklist>
-			<directory suffix=".php">framework/dev/</directory>
-			<directory suffix=".php">framework/thirdparty/</directory>
-			<directory suffix=".php">cms/thirdparty/</directory>
-			<file>framework/tests/PhpSyntaxTest.php</file>
-		</blacklist>
-	</filter>
-
 	<listeners>
 		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
     	<listener class="TeamCityListener" file="framework/dev/TeamCityListener.php"/>
@@ -41,4 +34,4 @@
 			<group>sanitychecks</group>
 		</exclude>
 	</groups>
-</phpunit>
+</phpunit>
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bf5b49a1..1d1f9997 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <!-- 
 	PHPUnit configuration for SilverStripe
 
-	Requires PHPUnit 3.6+
+	Requires PHPUnit 3.5+
 
 	Usage: 
 	 - "phpunit": Runs all tests in all folders
@@ -16,21 +16,14 @@
 	  for more information on configuration and execution options.
 	- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
 -->
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="true" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
+
 	<testsuite name="Default">
-		<directory>./</directory>
-		<exclude>framework/thirdparty/</exclude>
+		<directory>mysite/tests</directory>
+		<directory>cms/tests</directory>
+		<directory>framework/tests</directory>
 	</testsuite>
-
-	<filter>
-		<blacklist>
-			<directory suffix=".php">framework/dev/</directory>
-			<directory suffix=".php">framework/thirdparty/</directory>
-			<directory suffix=".php">cms/thirdparty/</directory>
-			<file>framework/tests/PhpSyntaxTest.php</file>
-		</blacklist>
-	</filter>
-
+	
 	<listeners>
 		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
 	</listeners>
@@ -40,4 +33,4 @@
 			<group>sanitychecks</group>
 		</exclude>
 	</groups>
-</phpunit>
+</phpunit>
\ No newline at end of file