diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 780e8db51d..faef186978 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,44 +1,44 @@
 <phpunit
-	bootstrap="tests/phpunit/includes/bootstrap.php"
-        backupGlobals="false"
-        colors="true"
-        beStrictAboutTestsThatDoNotTestAnything="true"
-        >
-    <testsuites>
-        <!-- Default test suite to run all tests -->
-        <testsuite name="default">
-            <directory suffix=".php">tests/phpunit/tests</directory>
-            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/oembed/headers.php</file>
-            <exclude>tests/phpunit/tests/actions/closures.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor.php</exclude>
-            <exclude>tests/phpunit/tests/image/editorGd.php</exclude>
-            <exclude>tests/phpunit/tests/image/editorImagick.php</exclude>
-            <exclude>tests/phpunit/tests/oembed/headers.php</exclude>
-            <exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
-        </testsuite>
-        <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->
-        <testsuite name="restapi-autosave">
-            <file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>ajax</group>
-            <group>ms-files</group>
-            <group>ms-required</group>
-            <group>external-http</group>
-        </exclude>
-    </groups>
-    <logging>
-        <log type="junit" target="tests/phpunit/build/logs/junit.xml" />
-    </logging>
-    <php>
-        <const name="WP_RUN_CORE_TESTS" value="1" />
-    </php>
+		bootstrap="tests/phpunit/includes/bootstrap.php"
+		backupGlobals="false"
+		colors="true"
+		beStrictAboutTestsThatDoNotTestAnything="true"
+		>
+	<testsuites>
+		<!-- Default test suite to run all tests -->
+		<testsuite name="default">
+			<directory suffix=".php">tests/phpunit/tests</directory>
+			<file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
+			<file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
+			<file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
+			<file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
+			<file phpVersion="5.3.0">tests/phpunit/tests/oembed/headers.php</file>
+			<exclude>tests/phpunit/tests/actions/closures.php</exclude>
+			<exclude>tests/phpunit/tests/image/editor.php</exclude>
+			<exclude>tests/phpunit/tests/image/editorGd.php</exclude>
+			<exclude>tests/phpunit/tests/image/editorImagick.php</exclude>
+			<exclude>tests/phpunit/tests/oembed/headers.php</exclude>
+			<exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
+		</testsuite>
+		<!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->
+		<testsuite name="restapi-autosave">
+			<file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>
+		</testsuite>
+	</testsuites>
+	<groups>
+		<exclude>
+			<group>ajax</group>
+			<group>ms-files</group>
+			<group>ms-required</group>
+			<group>external-http</group>
+		</exclude>
+	</groups>
+	<logging>
+		<log type="junit" target="tests/phpunit/build/logs/junit.xml" />
+	</logging>
+	<php>
+		<const name="WP_RUN_CORE_TESTS" value="1" />
+	</php>
 	<listeners>
 		<listener class="SpeedTrapListener" file="tests/phpunit/includes/listener-loader.php">
 			<arguments>
diff --git a/tests/phpunit/build.xml b/tests/phpunit/build.xml
index f770794861..ff8234bc50 100644
--- a/tests/phpunit/build.xml
+++ b/tests/phpunit/build.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="WordPress Unit Tests" default="build" basedir=".">
-    <target name="clean">
-        <delete dir="build" />
-    </target>
-    <target name="prepare">
-        <mkdir dir="build/logs" />
-        <mkdir dir="build/phpunitreport" />
-    </target>
-    <target name="phpunit">
-        <exec command="phpunit" passthru="true"></exec>
-        <phpunitreport infile="build/logs/junit.xml" format="frames" todir="build/phpunitreport" usesorttable="true" />
-    </target>
-    <target name="build" depends="clean,prepare,phpunit" />
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+	<target name="prepare">
+		<mkdir dir="build/logs" />
+		<mkdir dir="build/phpunitreport" />
+	</target>
+	<target name="phpunit">
+		<exec command="phpunit" passthru="true"></exec>
+		<phpunitreport infile="build/logs/junit.xml" format="frames" todir="build/phpunitreport" usesorttable="true" />
+	</target>
+	<target name="build" depends="clean,prepare,phpunit" />
 </project>
\ No newline at end of file
diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml
index 323c958cd8..0854ca4737 100644
--- a/tests/phpunit/multisite.xml
+++ b/tests/phpunit/multisite.xml
@@ -1,58 +1,58 @@
 <phpunit
 		bootstrap="includes/bootstrap.php"
-        backupGlobals="false"
-        colors="true"
-        beStrictAboutTestsThatDoNotTestAnything="true"
-        >
-    <php>
-        <const name="WP_TESTS_MULTISITE" value="1" />
-    </php>
-    <testsuites>
-        <!-- Default test suite to run all tests -->
-        <testsuite name="default">
-            <directory suffix=".php">tests</directory>
-            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
-            <exclude>tests/phpunit/tests/actions/closures.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor.php</exclude>
-            <exclude>tests/phpunit/tests/image/editorGd.php</exclude>
-            <exclude>tests/phpunit/tests/image/editorImagick.php</exclude>
-            <!-- Path relative to the checkout root, for PHPUnit 3.6.x -->
-            <exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
-            <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->
-            <exclude>tests/rest-api/rest-autosaves-controller.php</exclude>
-        </testsuite>
-        <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->
-        <testsuite name="restapi-autosave">
-            <!-- Path relative to the checkout root, for PHPUnit 3.6.x -->
-            <file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>
-            <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->
-            <file>tests/rest-api/rest-autosaves-controller.php</file>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>ajax</group>
-            <group>ms-files</group>
-            <group>ms-excluded</group>
-            <group>external-http</group>
-            <group>oembed-headers</group>
-        </exclude>
-    </groups>
-    <php>
-        <const name="WP_RUN_CORE_TESTS" value="1" />
-    </php>
-    <listeners>
-        <listener class="SpeedTrapListener" file="tests/phpunit/includes/listener-loader.php">
-            <arguments>
-                <array>
-                    <element key="slowThreshold">
-                        <integer>150</integer>
-                    </element>
-                </array>
-            </arguments>
-        </listener>
-    </listeners>
+		backupGlobals="false"
+		colors="true"
+		beStrictAboutTestsThatDoNotTestAnything="true"
+		>
+	<php>
+		<const name="WP_TESTS_MULTISITE" value="1" />
+	</php>
+	<testsuites>
+		<!-- Default test suite to run all tests -->
+		<testsuite name="default">
+			<directory suffix=".php">tests</directory>
+			<file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
+			<file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
+			<file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
+			<file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
+			<exclude>tests/phpunit/tests/actions/closures.php</exclude>
+			<exclude>tests/phpunit/tests/image/editor.php</exclude>
+			<exclude>tests/phpunit/tests/image/editorGd.php</exclude>
+			<exclude>tests/phpunit/tests/image/editorImagick.php</exclude>
+			<!-- Path relative to the checkout root, for PHPUnit 3.6.x -->
+			<exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
+			<!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->
+			<exclude>tests/rest-api/rest-autosaves-controller.php</exclude>
+		</testsuite>
+		<!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->
+		<testsuite name="restapi-autosave">
+			<!-- Path relative to the checkout root, for PHPUnit 3.6.x -->
+			<file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>
+			<!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->
+			<file>tests/rest-api/rest-autosaves-controller.php</file>
+		</testsuite>
+	</testsuites>
+	<groups>
+		<exclude>
+			<group>ajax</group>
+			<group>ms-files</group>
+			<group>ms-excluded</group>
+			<group>external-http</group>
+			<group>oembed-headers</group>
+		</exclude>
+	</groups>
+	<php>
+		<const name="WP_RUN_CORE_TESTS" value="1" />
+	</php>
+	<listeners>
+		<listener class="SpeedTrapListener" file="tests/phpunit/includes/listener-loader.php">
+			<arguments>
+				<array>
+					<element key="slowThreshold">
+						<integer>150</integer>
+					</element>
+				</array>
+			</arguments>
+		</listener>
+	</listeners>
 </phpunit>