318 files changed, 36 insertions, 39 deletions

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000000..2178ce2e42
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<phpunit

+	bootstrap="tests/phpunit/includes/bootstrap.php"

+        backupGlobals="false"

+        colors="true"

+        >

+    <testsuites>

+        <!-- Default test suite to run all tests -->

+        <testsuite>

+            <directory suffix=".php">tests/phpunit/tests</directory>

+            <exclude>tests/phpunit/tests/actions/closures.php</exclude>

+            <exclude>tests/phpunit/tests/image/editor.php</exclude>

+            <exclude>tests/phpunit/tests/image/editor_gd.php</exclude>

+            <exclude>tests/phpunit/tests/image/editor_imagick.php</exclude>

+            <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/editor_gd.php</file>

+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_imagick.php</file>

+        </testsuite>

+    </testsuites>

+    <groups>

+        <exclude>

+            <group>ajax</group>

+        </exclude>

+    </groups>

+    <logging>

+        <log type="junit" target="tests/phpunit/build/logs/junit.xml" logIncompleteSkipped="false"/>

+    </logging>

+</phpunit>

diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
deleted file mode 100644
index ff0b5882d7..0000000000
--- a/tests/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<phpunit

-	bootstrap="includes/bootstrap.php"

-        backupGlobals="false"

-        colors="true"

-        >

-    <testsuites>

-        <!-- Default test suite to run all tests -->

-        <testsuite>

-            <directory suffix=".php">tests</directory>

-            <exclude>tests/actions/closures.php</exclude>

-            <exclude>tests/image/editor.php</exclude>

-            <exclude>tests/image/editor_gd.php</exclude>

-            <exclude>tests/image/editor_imagick.php</exclude>

-            <file phpVersion="5.3.0">tests/actions/closures.php</file>

-            <file phpVersion="5.3.0">tests/image/editor.php</file>

-            <file phpVersion="5.3.0">tests/image/editor_gd.php</file>

-            <file phpVersion="5.3.0">tests/image/editor_imagick.php</file>

-        </testsuite>

-    </testsuites>

-    <groups>

-        <exclude>

-            <group>ajax</group>

-        </exclude>

-    </groups>

-    <logging>

-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>

-    </logging>

-</phpunit>

diff --git a/tests/README.txt b/tests/phpunit/README.txt
index 5934de97c2..5934de97c2 100644
--- a/tests/README.txt
+++ b/tests/phpunit/README.txt
diff --git a/tests/build.xml b/tests/phpunit/build.xml
index f770794861..f770794861 100644
--- a/tests/build.xml
+++ b/tests/phpunit/build.xml
diff --git a/tests/data/WPHTTP-testcase-redirection-script.php b/tests/phpunit/data/WPHTTP-testcase-redirection-script.php
index 02cb946fe1..02cb946fe1 100644
--- a/tests/data/WPHTTP-testcase-redirection-script.php
+++ b/tests/phpunit/data/WPHTTP-testcase-redirection-script.php
diff --git a/tests/data/export/crazy-cdata-escaped.xml b/tests/phpunit/data/export/crazy-cdata-escaped.xml
index 4f4d80fa51..4f4d80fa51 100644
--- a/tests/data/export/crazy-cdata-escaped.xml
+++ b/tests/phpunit/data/export/crazy-cdata-escaped.xml
diff --git a/tests/data/export/crazy-cdata.xml b/tests/phpunit/data/export/crazy-cdata.xml
index fc7d879c78..fc7d879c78 100644
--- a/tests/data/export/crazy-cdata.xml
+++ b/tests/phpunit/data/export/crazy-cdata.xml
diff --git a/tests/data/export/invalid-version-tag.xml b/tests/phpunit/data/export/invalid-version-tag.xml
index fddaca43bc..fddaca43bc 100644
--- a/tests/data/export/invalid-version-tag.xml
+++ b/tests/phpunit/data/export/invalid-version-tag.xml
diff --git a/tests/data/export/malformed.xml b/tests/phpunit/data/export/malformed.xml
index 06a7076fdb..06a7076fdb 100644
--- a/tests/data/export/malformed.xml
+++ b/tests/phpunit/data/export/malformed.xml
diff --git a/tests/data/export/missing-version-tag.xml b/tests/phpunit/data/export/missing-version-tag.xml
index 5bd233e319..5bd233e319 100644
--- a/tests/data/export/missing-version-tag.xml
+++ b/tests/phpunit/data/export/missing-version-tag.xml
diff --git a/tests/data/export/small-export.xml b/tests/phpunit/data/export/small-export.xml
index 20b3de9364..20b3de9364 100644
--- a/tests/data/export/small-export.xml
+++ b/tests/phpunit/data/export/small-export.xml
diff --git a/tests/data/export/test-serialized-postmeta-no-cdata.xml b/tests/phpunit/data/export/test-serialized-postmeta-no-cdata.xml
index dd75787f42..dd75787f42 100644
--- a/tests/data/export/test-serialized-postmeta-no-cdata.xml
+++ b/tests/phpunit/data/export/test-serialized-postmeta-no-cdata.xml
diff --git a/tests/data/export/test-serialized-postmeta-with-cdata.xml b/tests/phpunit/data/export/test-serialized-postmeta-with-cdata.xml
index 2fd3923501..2fd3923501 100644
--- a/tests/data/export/test-serialized-postmeta-with-cdata.xml
+++ b/tests/phpunit/data/export/test-serialized-postmeta-with-cdata.xml
diff --git a/tests/data/export/test-utw-post-meta-import.xml b/tests/phpunit/data/export/test-utw-post-meta-import.xml
index c491f6d4c8..c491f6d4c8 100644
--- a/tests/data/export/test-utw-post-meta-import.xml
+++ b/tests/phpunit/data/export/test-utw-post-meta-import.xml
diff --git a/tests/data/export/valid-wxr-1.0.xml b/tests/phpunit/data/export/valid-wxr-1.0.xml
index 587e57123b..587e57123b 100644
--- a/tests/data/export/valid-wxr-1.0.xml
+++ b/tests/phpunit/data/export/valid-wxr-1.0.xml
diff --git a/tests/data/export/valid-wxr-1.1.xml b/tests/phpunit/data/export/valid-wxr-1.1.xml
index f389741f1b..f389741f1b 100644
--- a/tests/data/export/valid-wxr-1.1.xml
+++ b/tests/phpunit/data/export/valid-wxr-1.1.xml
diff --git a/tests/data/formatting/big5.txt b/tests/phpunit/data/formatting/big5.txt
index 5e0ebb467b..5e0ebb467b 100644
--- a/tests/data/formatting/big5.txt
+++ b/tests/phpunit/data/formatting/big5.txt
diff --git a/tests/data/formatting/cr-line-endings-file-header.php b/tests/phpunit/data/formatting/cr-line-endings-file-header.php
index e8f3869999..e8f3869999 100644
--- a/tests/data/formatting/cr-line-endings-file-header.php
+++ b/tests/phpunit/data/formatting/cr-line-endings-file-header.php
diff --git a/tests/data/formatting/entities.txt b/tests/phpunit/data/formatting/entities.txt
index 02edb54508..02edb54508 100644
--- a/tests/data/formatting/entities.txt
+++ b/tests/phpunit/data/formatting/entities.txt
diff --git a/tests/data/formatting/remove_accents.01.input.txt b/tests/phpunit/data/formatting/remove_accents.01.input.txt
index 09da6827f1..09da6827f1 100644
--- a/tests/data/formatting/remove_accents.01.input.txt
+++ b/tests/phpunit/data/formatting/remove_accents.01.input.txt
diff --git a/tests/data/formatting/sizzle.js b/tests/phpunit/data/formatting/sizzle.js
index 58c2219cf1..58c2219cf1 100644
--- a/tests/data/formatting/sizzle.js
+++ b/tests/phpunit/data/formatting/sizzle.js
diff --git a/tests/data/formatting/utf-8/README b/tests/phpunit/data/formatting/utf-8/README
index 5bc6a317d3..5bc6a317d3 100644
--- a/tests/data/formatting/utf-8/README
+++ b/tests/phpunit/data/formatting/utf-8/README
diff --git a/tests/data/formatting/utf-8/entitize.py b/tests/phpunit/data/formatting/utf-8/entitize.py
index efa7cb18d5..efa7cb18d5 100644
--- a/tests/data/formatting/utf-8/entitize.py
+++ b/tests/phpunit/data/formatting/utf-8/entitize.py
diff --git a/tests/data/formatting/utf-8/entitized.txt b/tests/phpunit/data/formatting/utf-8/entitized.txt
index a29c9f9216..a29c9f9216 100644
--- a/tests/data/formatting/utf-8/entitized.txt
+++ b/tests/phpunit/data/formatting/utf-8/entitized.txt
diff --git a/tests/data/formatting/utf-8/u-urlencode.py b/tests/phpunit/data/formatting/utf-8/u-urlencode.py
index c20a14f1f8..c20a14f1f8 100644
--- a/tests/data/formatting/utf-8/u-urlencode.py
+++ b/tests/phpunit/data/formatting/utf-8/u-urlencode.py
diff --git a/tests/data/formatting/utf-8/u-urlencoded.txt b/tests/phpunit/data/formatting/utf-8/u-urlencoded.txt
index ad4e422c75..ad4e422c75 100644
--- a/tests/data/formatting/utf-8/u-urlencoded.txt
+++ b/tests/phpunit/data/formatting/utf-8/u-urlencoded.txt
diff --git a/tests/data/formatting/utf-8/urlencode.py b/tests/phpunit/data/formatting/utf-8/urlencode.py
index d29907f24b..d29907f24b 100644
--- a/tests/data/formatting/utf-8/urlencode.py
+++ b/tests/phpunit/data/formatting/utf-8/urlencode.py
diff --git a/tests/data/formatting/utf-8/urlencoded.txt b/tests/phpunit/data/formatting/utf-8/urlencoded.txt
index 930bf13ff6..930bf13ff6 100644
--- a/tests/data/formatting/utf-8/urlencoded.txt
+++ b/tests/phpunit/data/formatting/utf-8/urlencoded.txt
diff --git a/tests/data/formatting/utf-8/utf-8.txt b/tests/phpunit/data/formatting/utf-8/utf-8.txt
index 1596029d20..1596029d20 100644
--- a/tests/data/formatting/utf-8/utf-8.txt
+++ b/tests/phpunit/data/formatting/utf-8/utf-8.txt
diff --git a/tests/data/formatting/windows1252.py b/tests/phpunit/data/formatting/windows1252.py
index a4fe402703..a4fe402703 100644
--- a/tests/data/formatting/windows1252.py
+++ b/tests/phpunit/data/formatting/windows1252.py
diff --git a/tests/data/formatting/xssAttacks.xml b/tests/phpunit/data/formatting/xssAttacks.xml
index 017bf1f347..017bf1f347 100644
--- a/tests/data/formatting/xssAttacks.xml
+++ b/tests/phpunit/data/formatting/xssAttacks.xml
diff --git a/tests/data/images/2004-07-22-DSC_0007.jpg b/tests/phpunit/data/images/2004-07-22-DSC_0007.jpg
index a9703f333d..a9703f333d 100644
--- a/tests/data/images/2004-07-22-DSC_0007.jpg
+++ b/tests/phpunit/data/images/2004-07-22-DSC_0007.jpg
diff --git a/tests/data/images/2004-07-22-DSC_0008.jpg b/tests/phpunit/data/images/2004-07-22-DSC_0008.jpg
index faa12f3160..faa12f3160 100644
--- a/tests/data/images/2004-07-22-DSC_0008.jpg
+++ b/tests/phpunit/data/images/2004-07-22-DSC_0008.jpg
diff --git a/tests/data/images/2007-06-17DSC_4173.JPG b/tests/phpunit/data/images/2007-06-17DSC_4173.JPG
index 2cbe3b90f7..2cbe3b90f7 100644
--- a/tests/data/images/2007-06-17DSC_4173.JPG
+++ b/tests/phpunit/data/images/2007-06-17DSC_4173.JPG
diff --git a/tests/data/images/a2-small-100x75.jpg b/tests/phpunit/data/images/a2-small-100x75.jpg
index 1cce87d999..1cce87d999 100644
--- a/tests/data/images/a2-small-100x75.jpg
+++ b/tests/phpunit/data/images/a2-small-100x75.jpg
diff --git a/tests/data/images/a2-small.jpg b/tests/phpunit/data/images/a2-small.jpg
index d3d7bbc3ac..d3d7bbc3ac 100644
--- a/tests/data/images/a2-small.jpg
+++ b/tests/phpunit/data/images/a2-small.jpg
diff --git a/tests/data/images/canola.jpg b/tests/phpunit/data/images/canola.jpg
index 938be00cde..938be00cde 100644
--- a/tests/data/images/canola.jpg
+++ b/tests/phpunit/data/images/canola.jpg
diff --git a/tests/data/images/gradient-square.jpg b/tests/phpunit/data/images/gradient-square.jpg
index 9f2cb3fb54..9f2cb3fb54 100644
--- a/tests/data/images/gradient-square.jpg
+++ b/tests/phpunit/data/images/gradient-square.jpg
diff --git a/tests/data/images/test-image-cmyk.jpg b/tests/phpunit/data/images/test-image-cmyk.jpg
index 9b3b112449..9b3b112449 100755
--- a/tests/data/images/test-image-cmyk.jpg
+++ b/tests/phpunit/data/images/test-image-cmyk.jpg
diff --git a/tests/data/images/test-image-grayscale.jpg b/tests/phpunit/data/images/test-image-grayscale.jpg
index 7e8903181b..7e8903181b 100755
--- a/tests/data/images/test-image-grayscale.jpg
+++ b/tests/phpunit/data/images/test-image-grayscale.jpg
diff --git a/tests/data/images/test-image-iptc.jpg b/tests/phpunit/data/images/test-image-iptc.jpg
index a054dec2c6..a054dec2c6 100644
--- a/tests/data/images/test-image-iptc.jpg
+++ b/tests/phpunit/data/images/test-image-iptc.jpg
diff --git a/tests/data/images/test-image-lzw.tiff b/tests/phpunit/data/images/test-image-lzw.tiff
index 0fdfc079aa..0fdfc079aa 100644
--- a/tests/data/images/test-image-lzw.tiff
+++ b/tests/phpunit/data/images/test-image-lzw.tiff
diff --git a/tests/data/images/test-image-mime-jpg.png b/tests/phpunit/data/images/test-image-mime-jpg.png
index 534aac1d6b..534aac1d6b 100644
--- a/tests/data/images/test-image-mime-jpg.png
+++ b/tests/phpunit/data/images/test-image-mime-jpg.png
diff --git a/tests/data/images/test-image-zip.tiff b/tests/phpunit/data/images/test-image-zip.tiff
index 5ed5986388..5ed5986388 100644
--- a/tests/data/images/test-image-zip.tiff
+++ b/tests/phpunit/data/images/test-image-zip.tiff
diff --git a/tests/data/images/test-image.bmp b/tests/phpunit/data/images/test-image.bmp
index 97a54ce379..97a54ce379 100644
--- a/tests/data/images/test-image.bmp
+++ b/tests/phpunit/data/images/test-image.bmp
diff --git a/tests/data/images/test-image.gif b/tests/phpunit/data/images/test-image.gif
index 8fad364479..8fad364479 100644
--- a/tests/data/images/test-image.gif
+++ b/tests/phpunit/data/images/test-image.gif
diff --git a/tests/data/images/test-image.jp2 b/tests/phpunit/data/images/test-image.jp2
index 4d96c3c4d7..4d96c3c4d7 100644
--- a/tests/data/images/test-image.jp2
+++ b/tests/phpunit/data/images/test-image.jp2
diff --git a/tests/data/images/test-image.jpg b/tests/phpunit/data/images/test-image.jpg
index 534aac1d6b..534aac1d6b 100644
--- a/tests/data/images/test-image.jpg
+++ b/tests/phpunit/data/images/test-image.jpg
diff --git a/tests/data/images/test-image.pct b/tests/phpunit/data/images/test-image.pct
index 7466604764..7466604764 100644
--- a/tests/data/images/test-image.pct
+++ b/tests/phpunit/data/images/test-image.pct
diff --git a/tests/data/images/test-image.png b/tests/phpunit/data/images/test-image.png
index 642ce92975..642ce92975 100644
--- a/tests/data/images/test-image.png
+++ b/tests/phpunit/data/images/test-image.png
diff --git a/tests/data/images/test-image.psd b/tests/phpunit/data/images/test-image.psd
index 3389eb4985..3389eb4985 100644
--- a/tests/data/images/test-image.psd
+++ b/tests/phpunit/data/images/test-image.psd
diff --git a/tests/data/images/test-image.sgi b/tests/phpunit/data/images/test-image.sgi
index e5674c0de9..e5674c0de9 100644
--- a/tests/data/images/test-image.sgi
+++ b/tests/phpunit/data/images/test-image.sgi
diff --git a/tests/data/images/test-image.tga b/tests/phpunit/data/images/test-image.tga
index b0593cbf80..b0593cbf80 100644
--- a/tests/data/images/test-image.tga
+++ b/tests/phpunit/data/images/test-image.tga
diff --git a/tests/data/images/test-image.tiff b/tests/phpunit/data/images/test-image.tiff
index 67c30947f7..67c30947f7 100644
--- a/tests/data/images/test-image.tiff
+++ b/tests/phpunit/data/images/test-image.tiff
diff --git a/tests/data/images/transparent.png b/tests/phpunit/data/images/transparent.png
index d130501eeb..d130501eeb 100644
--- a/tests/data/images/transparent.png
+++ b/tests/phpunit/data/images/transparent.png
diff --git a/tests/data/images/waffles.jpg b/tests/phpunit/data/images/waffles.jpg
index e69cae58c6..e69cae58c6 100644
--- a/tests/data/images/waffles.jpg
+++ b/tests/phpunit/data/images/waffles.jpg
diff --git a/tests/data/plugins/hello.php b/tests/phpunit/data/plugins/hello.php
index 8d6287f77a..8d6287f77a 100644
--- a/tests/data/plugins/hello.php
+++ b/tests/phpunit/data/plugins/hello.php
diff --git a/tests/data/pomo/bad_nplurals.mo b/tests/phpunit/data/pomo/bad_nplurals.mo
index d2aef437cd..d2aef437cd 100644
--- a/tests/data/pomo/bad_nplurals.mo
+++ b/tests/phpunit/data/pomo/bad_nplurals.mo
diff --git a/tests/data/pomo/bad_nplurals.po b/tests/phpunit/data/pomo/bad_nplurals.po
index c24342fc0f..c24342fc0f 100644
--- a/tests/data/pomo/bad_nplurals.po
+++ b/tests/phpunit/data/pomo/bad_nplurals.po
diff --git a/tests/data/pomo/context.mo b/tests/phpunit/data/pomo/context.mo
index a94a040789..a94a040789 100644
--- a/tests/data/pomo/context.mo
+++ b/tests/phpunit/data/pomo/context.mo
diff --git a/tests/data/pomo/de_DE-2.8.mo b/tests/phpunit/data/pomo/de_DE-2.8.mo
index 7e9334cb8f..7e9334cb8f 100644
--- a/tests/data/pomo/de_DE-2.8.mo
+++ b/tests/phpunit/data/pomo/de_DE-2.8.mo
diff --git a/tests/data/pomo/empty.po b/tests/phpunit/data/pomo/empty.po
index e69de29bb2..e69de29bb2 100644
--- a/tests/data/pomo/empty.po
+++ b/tests/phpunit/data/pomo/empty.po
diff --git a/tests/data/pomo/mo.pot b/tests/phpunit/data/pomo/mo.pot
index 6e6e50b544..6e6e50b544 100644
--- a/tests/data/pomo/mo.pot
+++ b/tests/phpunit/data/pomo/mo.pot
diff --git a/tests/data/pomo/overload.mo b/tests/phpunit/data/pomo/overload.mo
index 87ca72ec4f..87ca72ec4f 100644
--- a/tests/data/pomo/overload.mo
+++ b/tests/phpunit/data/pomo/overload.mo
diff --git a/tests/data/pomo/plural.mo b/tests/phpunit/data/pomo/plural.mo
index c838ad5bbf..c838ad5bbf 100644
--- a/tests/data/pomo/plural.mo
+++ b/tests/phpunit/data/pomo/plural.mo
diff --git a/tests/data/pomo/simple.mo b/tests/phpunit/data/pomo/simple.mo
index 18ca12d94e..18ca12d94e 100644
--- a/tests/data/pomo/simple.mo
+++ b/tests/phpunit/data/pomo/simple.mo
diff --git a/tests/data/pomo/simple.po b/tests/phpunit/data/pomo/simple.po
index 114febd1b3..114febd1b3 100644
--- a/tests/data/pomo/simple.po
+++ b/tests/phpunit/data/pomo/simple.po
diff --git a/tests/data/pomo/windows-line-endings.po b/tests/phpunit/data/pomo/windows-line-endings.po
index 79b05c2614..79b05c2614 100644
--- a/tests/data/pomo/windows-line-endings.po
+++ b/tests/phpunit/data/pomo/windows-line-endings.po
diff --git a/tests/data/themedir1/default/functions.php b/tests/phpunit/data/themedir1/default/functions.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/default/functions.php
+++ b/tests/phpunit/data/themedir1/default/functions.php
diff --git a/tests/data/themedir1/default/index.php b/tests/phpunit/data/themedir1/default/index.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/default/index.php
+++ b/tests/phpunit/data/themedir1/default/index.php
diff --git a/tests/data/themedir1/default/style.css b/tests/phpunit/data/themedir1/default/style.css
index 05b7d4048c..05b7d4048c 100644
--- a/tests/data/themedir1/default/style.css
+++ b/tests/phpunit/data/themedir1/default/style.css
diff --git a/tests/data/themedir1/page-templates/index.php b/tests/phpunit/data/themedir1/page-templates/index.php
index e0c765371d..e0c765371d 100644
--- a/tests/data/themedir1/page-templates/index.php
+++ b/tests/phpunit/data/themedir1/page-templates/index.php
diff --git a/tests/data/themedir1/page-templates/style.css b/tests/phpunit/data/themedir1/page-templates/style.css
index 7ce31bf771..7ce31bf771 100644
--- a/tests/data/themedir1/page-templates/style.css
+++ b/tests/phpunit/data/themedir1/page-templates/style.css
diff --git a/tests/data/themedir1/page-templates/subdir/template-sub-dir.php b/tests/phpunit/data/themedir1/page-templates/subdir/template-sub-dir.php
index ff0a3c81d0..ff0a3c81d0 100644
--- a/tests/data/themedir1/page-templates/subdir/template-sub-dir.php
+++ b/tests/phpunit/data/themedir1/page-templates/subdir/template-sub-dir.php
diff --git a/tests/data/themedir1/page-templates/template-header.php b/tests/phpunit/data/themedir1/page-templates/template-header.php
index 61381bf822..61381bf822 100644
--- a/tests/data/themedir1/page-templates/template-header.php
+++ b/tests/phpunit/data/themedir1/page-templates/template-header.php
diff --git a/tests/data/themedir1/page-templates/template-top-level.php b/tests/phpunit/data/themedir1/page-templates/template-top-level.php
index 7ff3b50558..7ff3b50558 100644
--- a/tests/data/themedir1/page-templates/template-top-level.php
+++ b/tests/phpunit/data/themedir1/page-templates/template-top-level.php
diff --git a/tests/data/themedir1/sandbox/functions.php b/tests/phpunit/data/themedir1/sandbox/functions.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/sandbox/functions.php
+++ b/tests/phpunit/data/themedir1/sandbox/functions.php
diff --git a/tests/data/themedir1/sandbox/index.php b/tests/phpunit/data/themedir1/sandbox/index.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/sandbox/index.php
+++ b/tests/phpunit/data/themedir1/sandbox/index.php
diff --git a/tests/data/themedir1/sandbox/style.css b/tests/phpunit/data/themedir1/sandbox/style.css
index b7f03afb70..b7f03afb70 100644
--- a/tests/data/themedir1/sandbox/style.css
+++ b/tests/phpunit/data/themedir1/sandbox/style.css
diff --git a/tests/data/themedir1/stylesheetonly/style.css b/tests/phpunit/data/themedir1/stylesheetonly/style.css
index f3f7585b8e..f3f7585b8e 100644
--- a/tests/data/themedir1/stylesheetonly/style.css
+++ b/tests/phpunit/data/themedir1/stylesheetonly/style.css
diff --git a/tests/data/themedir1/subdir/theme with spaces/index.php b/tests/phpunit/data/themedir1/subdir/theme with spaces/index.php
index b3d9bbc7f3..b3d9bbc7f3 100644
--- a/tests/data/themedir1/subdir/theme with spaces/index.php
+++ b/tests/phpunit/data/themedir1/subdir/theme with spaces/index.php
diff --git a/tests/data/themedir1/subdir/theme with spaces/style.css b/tests/phpunit/data/themedir1/subdir/theme with spaces/style.css
index d1f1d050ed..d1f1d050ed 100644
--- a/tests/data/themedir1/subdir/theme with spaces/style.css
+++ b/tests/phpunit/data/themedir1/subdir/theme with spaces/style.css
diff --git a/tests/data/themedir1/subdir/theme2/functions.php b/tests/phpunit/data/themedir1/subdir/theme2/functions.php
index 15c5adc7fa..15c5adc7fa 100644
--- a/tests/data/themedir1/subdir/theme2/functions.php
+++ b/tests/phpunit/data/themedir1/subdir/theme2/functions.php
diff --git a/tests/data/themedir1/subdir/theme2/index.php b/tests/phpunit/data/themedir1/subdir/theme2/index.php
index 15c5adc7fa..15c5adc7fa 100644
--- a/tests/data/themedir1/subdir/theme2/index.php
+++ b/tests/phpunit/data/themedir1/subdir/theme2/index.php
diff --git a/tests/data/themedir1/subdir/theme2/style.css b/tests/phpunit/data/themedir1/subdir/theme2/style.css
index 5abb800aa7..5abb800aa7 100644
--- a/tests/data/themedir1/subdir/theme2/style.css
+++ b/tests/phpunit/data/themedir1/subdir/theme2/style.css
diff --git a/tests/data/themedir1/theme1-dupe/functions.php b/tests/phpunit/data/themedir1/theme1-dupe/functions.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/theme1-dupe/functions.php
+++ b/tests/phpunit/data/themedir1/theme1-dupe/functions.php
diff --git a/tests/data/themedir1/theme1-dupe/index.php b/tests/phpunit/data/themedir1/theme1-dupe/index.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/theme1-dupe/index.php
+++ b/tests/phpunit/data/themedir1/theme1-dupe/index.php
diff --git a/tests/data/themedir1/theme1-dupe/style.css b/tests/phpunit/data/themedir1/theme1-dupe/style.css
index 193572bedb..193572bedb 100644
--- a/tests/data/themedir1/theme1-dupe/style.css
+++ b/tests/phpunit/data/themedir1/theme1-dupe/style.css
diff --git a/tests/data/themedir1/theme1/functions.php b/tests/phpunit/data/themedir1/theme1/functions.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/theme1/functions.php
+++ b/tests/phpunit/data/themedir1/theme1/functions.php
diff --git a/tests/data/themedir1/theme1/index.php b/tests/phpunit/data/themedir1/theme1/index.php
index 1c8413d3a1..1c8413d3a1 100644
--- a/tests/data/themedir1/theme1/index.php
+++ b/tests/phpunit/data/themedir1/theme1/index.php
diff --git a/tests/data/themedir1/theme1/style.css b/tests/phpunit/data/themedir1/theme1/style.css
index f0d8cb780e..f0d8cb780e 100644
--- a/tests/data/themedir1/theme1/style.css
+++ b/tests/phpunit/data/themedir1/theme1/style.css
diff --git a/tests/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 626b486841..b73dd4e09c 100644
--- a/tests/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -4,21 +4,18 @@
  */
 
 
-$config_file_path = dirname( __FILE__ ) . '/../wp-tests-config.php';
-if ( ! file_exists( $config_file_path ) ) {
-	// Support having the config file one level up.
-	$config_file_path = dirname( __FILE__ ) . '/../../wp-tests-config.php';
+$config_file_path = dirname( dirname( __FILE__ ) );
+if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) {
+	// Support the config file from the root of the develop repository.
+	if ( basename( $config_file_path ) === 'phpunit' && basename( dirname( $config_file_path ) ) === 'tests' )
+		$config_file_path = dirname( dirname( $config_file_path ) );
 }
+$config_file_path .= '/wp-tests-config.php';
 
 /*
  * Globalize some WordPress variables, because PHPUnit loads this file inside a function
  * See: https://github.com/sebastianbergmann/phpunit/issues/325
- *
- * These are not needed for WordPress 3.3+, only for older versions
-*/
-global $table_prefix, $wp_embed, $wp_locale, $_wp_deprecated_widgets_callbacks, $wp_widget_factory;
-
-// These are still needed
+ */
 global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer;
 
 if ( !is_readable( $config_file_path ) ) {
diff --git a/tests/includes/exceptions.php b/tests/phpunit/includes/exceptions.php
index 50976fb0b3..50976fb0b3 100644
--- a/tests/includes/exceptions.php
+++ b/tests/phpunit/includes/exceptions.php
diff --git a/tests/includes/factory.php b/tests/phpunit/includes/factory.php
index bf5ba53777..bf5ba53777 100644
--- a/tests/includes/factory.php
+++ b/tests/phpunit/includes/factory.php
diff --git a/tests/includes/functions.php b/tests/phpunit/includes/functions.php
index 5759d530c9..5759d530c9 100644
--- a/tests/includes/functions.php
+++ b/tests/phpunit/includes/functions.php
diff --git a/tests/includes/install.php b/tests/phpunit/includes/install.php
index 63de9d2185..63de9d2185 100644
--- a/tests/includes/install.php
+++ b/tests/phpunit/includes/install.php
diff --git a/tests/includes/mock-fs.php b/tests/phpunit/includes/mock-fs.php
index 3a99f8ba97..3a99f8ba97 100644
--- a/tests/includes/mock-fs.php
+++ b/tests/phpunit/includes/mock-fs.php
diff --git a/tests/includes/mock-image-editor.php b/tests/phpunit/includes/mock-image-editor.php
index 2d8164e5c9..2d8164e5c9 100644
--- a/tests/includes/mock-image-editor.php
+++ b/tests/phpunit/includes/mock-image-editor.php
diff --git a/tests/includes/mock-mailer.php b/tests/phpunit/includes/mock-mailer.php
index f52a95a064..f52a95a064 100644
--- a/tests/includes/mock-mailer.php
+++ b/tests/phpunit/includes/mock-mailer.php
diff --git a/tests/includes/testcase-ajax.php b/tests/phpunit/includes/testcase-ajax.php
index fcceacc42b..fcceacc42b 100644
--- a/tests/includes/testcase-ajax.php
+++ b/tests/phpunit/includes/testcase-ajax.php
diff --git a/tests/includes/testcase-xmlrpc.php b/tests/phpunit/includes/testcase-xmlrpc.php
index e82c5e134e..e82c5e134e 100644
--- a/tests/includes/testcase-xmlrpc.php
+++ b/tests/phpunit/includes/testcase-xmlrpc.php
diff --git a/tests/includes/testcase.php b/tests/phpunit/includes/testcase.php
index c3fb4373df..c3fb4373df 100644
--- a/tests/includes/testcase.php
+++ b/tests/phpunit/includes/testcase.php
diff --git a/tests/includes/trac.php b/tests/phpunit/includes/trac.php
index 70b56a0a13..70b56a0a13 100644
--- a/tests/includes/trac.php
+++ b/tests/phpunit/includes/trac.php
diff --git a/tests/includes/utils.php b/tests/phpunit/includes/utils.php
index b6d722663c..b6d722663c 100644
--- a/tests/includes/utils.php
+++ b/tests/phpunit/includes/utils.php
diff --git a/tests/includes/wp-profiler.php b/tests/phpunit/includes/wp-profiler.php
index 1ea4d2e49e..1ea4d2e49e 100644
--- a/tests/includes/wp-profiler.php
+++ b/tests/phpunit/includes/wp-profiler.php
diff --git a/tests/multisite.xml b/tests/phpunit/multisite.xml
index 5408a3b67a..5408a3b67a 100644
--- a/tests/multisite.xml
+++ b/tests/phpunit/multisite.xml
diff --git a/tests/tests/actions.php b/tests/phpunit/tests/actions.php
index fb87ee0ab3..fb87ee0ab3 100644
--- a/tests/tests/actions.php
+++ b/tests/phpunit/tests/actions.php
diff --git a/tests/tests/actions/callbacks.php b/tests/phpunit/tests/actions/callbacks.php
index 41db3dac3a..41db3dac3a 100644
--- a/tests/tests/actions/callbacks.php
+++ b/tests/phpunit/tests/actions/callbacks.php
diff --git a/tests/tests/actions/closures.php b/tests/phpunit/tests/actions/closures.php
index 4dd3d5c1e3..4dd3d5c1e3 100644
--- a/tests/tests/actions/closures.php
+++ b/tests/phpunit/tests/actions/closures.php
diff --git a/tests/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php
index f4ee0f1375..f4ee0f1375 100644
--- a/tests/tests/admin/includesFile.php
+++ b/tests/phpunit/tests/admin/includesFile.php
diff --git a/tests/tests/admin/includesMisc.php b/tests/phpunit/tests/admin/includesMisc.php
index 6293013ba5..6293013ba5 100644
--- a/tests/tests/admin/includesMisc.php
+++ b/tests/phpunit/tests/admin/includesMisc.php
diff --git a/tests/tests/admin/includesPlugin.php b/tests/phpunit/tests/admin/includesPlugin.php
index bb09d783b5..bb09d783b5 100644
--- a/tests/tests/admin/includesPlugin.php
+++ b/tests/phpunit/tests/admin/includesPlugin.php
diff --git a/tests/tests/admin/includesPost.php b/tests/phpunit/tests/admin/includesPost.php
index e359830ca1..e359830ca1 100644
--- a/tests/tests/admin/includesPost.php
+++ b/tests/phpunit/tests/admin/includesPost.php
diff --git a/tests/tests/admin/includesScreen.php b/tests/phpunit/tests/admin/includesScreen.php
index 7952e3f0e2..7952e3f0e2 100644
--- a/tests/tests/admin/includesScreen.php
+++ b/tests/phpunit/tests/admin/includesScreen.php
diff --git a/tests/tests/admin/includesTemplate.php b/tests/phpunit/tests/admin/includesTemplate.php
index b3bd6dccb6..b3bd6dccb6 100644
--- a/tests/tests/admin/includesTemplate.php
+++ b/tests/phpunit/tests/admin/includesTemplate.php
diff --git a/tests/tests/admin/includesTheme.php b/tests/phpunit/tests/admin/includesTheme.php
index 9906f48e17..9906f48e17 100644
--- a/tests/tests/admin/includesTheme.php
+++ b/tests/phpunit/tests/admin/includesTheme.php
diff --git a/tests/tests/adminbar.php b/tests/phpunit/tests/adminbar.php
index 533f7caad1..533f7caad1 100644
--- a/tests/tests/adminbar.php
+++ b/tests/phpunit/tests/adminbar.php
diff --git a/tests/tests/ajax/Autosave.php b/tests/phpunit/tests/ajax/Autosave.php
index 4b9c00c390..4b9c00c390 100644
--- a/tests/tests/ajax/Autosave.php
+++ b/tests/phpunit/tests/ajax/Autosave.php
diff --git a/tests/tests/ajax/Compression.php b/tests/phpunit/tests/ajax/Compression.php
index cd76532023..cd76532023 100644
--- a/tests/tests/ajax/Compression.php
+++ b/tests/phpunit/tests/ajax/Compression.php
diff --git a/tests/tests/ajax/DeleteComment.php b/tests/phpunit/tests/ajax/DeleteComment.php
index 97a2c02660..97a2c02660 100644
--- a/tests/tests/ajax/DeleteComment.php
+++ b/tests/phpunit/tests/ajax/DeleteComment.php
diff --git a/tests/tests/ajax/DimComment.php b/tests/phpunit/tests/ajax/DimComment.php
index d34b64d852..d34b64d852 100644
--- a/tests/tests/ajax/DimComment.php
+++ b/tests/phpunit/tests/ajax/DimComment.php
diff --git a/tests/tests/ajax/EditComment.php b/tests/phpunit/tests/ajax/EditComment.php
index 8c6ebdfcea..8c6ebdfcea 100644
--- a/tests/tests/ajax/EditComment.php
+++ b/tests/phpunit/tests/ajax/EditComment.php
diff --git a/tests/tests/ajax/GetComments.php b/tests/phpunit/tests/ajax/GetComments.php
index b9dec083fc..b9dec083fc 100644
--- a/tests/tests/ajax/GetComments.php
+++ b/tests/phpunit/tests/ajax/GetComments.php
diff --git a/tests/tests/ajax/MediaEdit.php b/tests/phpunit/tests/ajax/MediaEdit.php
index a17e724718..a17e724718 100644
--- a/tests/tests/ajax/MediaEdit.php
+++ b/tests/phpunit/tests/ajax/MediaEdit.php
diff --git a/tests/tests/ajax/ReplytoComment.php b/tests/phpunit/tests/ajax/ReplytoComment.php
index a8407a6e80..a8407a6e80 100644
--- a/tests/tests/ajax/ReplytoComment.php
+++ b/tests/phpunit/tests/ajax/ReplytoComment.php
diff --git a/tests/tests/ajax/Response.php b/tests/phpunit/tests/ajax/Response.php
index 9626d752dd..9626d752dd 100644
--- a/tests/tests/ajax/Response.php
+++ b/tests/phpunit/tests/ajax/Response.php
diff --git a/tests/tests/ajax/TagSearch.php b/tests/phpunit/tests/ajax/TagSearch.php
index 2f1c7716be..2f1c7716be 100644
--- a/tests/tests/ajax/TagSearch.php
+++ b/tests/phpunit/tests/ajax/TagSearch.php
diff --git a/tests/tests/attachment/slashes.php b/tests/phpunit/tests/attachment/slashes.php
index dec69343a3..dec69343a3 100644
--- a/tests/tests/attachment/slashes.php
+++ b/tests/phpunit/tests/attachment/slashes.php
diff --git a/tests/tests/auth.php b/tests/phpunit/tests/auth.php
index f2d6552102..f2d6552102 100644
--- a/tests/tests/auth.php
+++ b/tests/phpunit/tests/auth.php
diff --git a/tests/tests/basic.php b/tests/phpunit/tests/basic.php
index 5c57945ae6..5c57945ae6 100644
--- a/tests/tests/basic.php
+++ b/tests/phpunit/tests/basic.php
diff --git a/tests/tests/cache.php b/tests/phpunit/tests/cache.php
index dce0cd791e..dce0cd791e 100644
--- a/tests/tests/cache.php
+++ b/tests/phpunit/tests/cache.php
diff --git a/tests/tests/canonical.php b/tests/phpunit/tests/canonical.php
index c45da604a5..c45da604a5 100644
--- a/tests/tests/canonical.php
+++ b/tests/phpunit/tests/canonical.php
diff --git a/tests/tests/canonical/customRules.php b/tests/phpunit/tests/canonical/customRules.php
index dff15876a3..dff15876a3 100644
--- a/tests/tests/canonical/customRules.php
+++ b/tests/phpunit/tests/canonical/customRules.php
diff --git a/tests/tests/canonical/noRewrite.php b/tests/phpunit/tests/canonical/noRewrite.php
index b83340837b..b83340837b 100644
--- a/tests/tests/canonical/noRewrite.php
+++ b/tests/phpunit/tests/canonical/noRewrite.php
diff --git a/tests/tests/canonical/pageOnFront.php b/tests/phpunit/tests/canonical/pageOnFront.php
index 6c0cf6649c..6c0cf6649c 100644
--- a/tests/tests/canonical/pageOnFront.php
+++ b/tests/phpunit/tests/canonical/pageOnFront.php
diff --git a/tests/tests/canonical/permalinkFormats.php b/tests/phpunit/tests/canonical/permalinkFormats.php
index fdf43a2261..fdf43a2261 100644
--- a/tests/tests/canonical/permalinkFormats.php
+++ b/tests/phpunit/tests/canonical/permalinkFormats.php
diff --git a/tests/tests/comment.php b/tests/phpunit/tests/comment.php
index ddb6212b9f..ddb6212b9f 100644
--- a/tests/tests/comment.php
+++ b/tests/phpunit/tests/comment.php
diff --git a/tests/tests/comment/dateQuery.php b/tests/phpunit/tests/comment/dateQuery.php
index d64a8428c5..d64a8428c5 100644
--- a/tests/tests/comment/dateQuery.php
+++ b/tests/phpunit/tests/comment/dateQuery.php
diff --git a/tests/tests/comment/query.php b/tests/phpunit/tests/comment/query.php
index 4ab4f3aa21..4ab4f3aa21 100644
--- a/tests/tests/comment/query.php
+++ b/tests/phpunit/tests/comment/query.php
diff --git a/tests/tests/comment/slashes.php b/tests/phpunit/tests/comment/slashes.php
index 9d27f12bdd..9d27f12bdd 100644
--- a/tests/tests/comment/slashes.php
+++ b/tests/phpunit/tests/comment/slashes.php
diff --git a/tests/tests/compat.php b/tests/phpunit/tests/compat.php
index 3409dbca0b..3409dbca0b 100644
--- a/tests/tests/compat.php
+++ b/tests/phpunit/tests/compat.php
diff --git a/tests/tests/cron.php b/tests/phpunit/tests/cron.php
index b97cfcf915..b97cfcf915 100644
--- a/tests/tests/cron.php
+++ b/tests/phpunit/tests/cron.php
diff --git a/tests/tests/db.php b/tests/phpunit/tests/db.php
index 83770d5fde..83770d5fde 100644
--- a/tests/tests/db.php
+++ b/tests/phpunit/tests/db.php
diff --git a/tests/tests/dependencies.php b/tests/phpunit/tests/dependencies.php
index 105a6dbffa..105a6dbffa 100644
--- a/tests/tests/dependencies.php
+++ b/tests/phpunit/tests/dependencies.php
diff --git a/tests/tests/dependencies/jquery.php b/tests/phpunit/tests/dependencies/jquery.php
index 6d738c5a52..6d738c5a52 100644
--- a/tests/tests/dependencies/jquery.php
+++ b/tests/phpunit/tests/dependencies/jquery.php
diff --git a/tests/tests/dependencies/scripts.php b/tests/phpunit/tests/dependencies/scripts.php
index bd3bc889a2..bd3bc889a2 100644
--- a/tests/tests/dependencies/scripts.php
+++ b/tests/phpunit/tests/dependencies/scripts.php
diff --git a/tests/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php
index 4726c034fa..4726c034fa 100644
--- a/tests/tests/dependencies/styles.php
+++ b/tests/phpunit/tests/dependencies/styles.php
diff --git a/tests/tests/export/class-wp-export-query.php b/tests/phpunit/tests/export/class-wp-export-query.php
index aa51ea5ac0..aa51ea5ac0 100644
--- a/tests/tests/export/class-wp-export-query.php
+++ b/tests/phpunit/tests/export/class-wp-export-query.php
diff --git a/tests/tests/export/functions.export.php b/tests/phpunit/tests/export/functions.export.php
index fa9acf5c5b..fa9acf5c5b 100644
--- a/tests/tests/export/functions.export.php
+++ b/tests/phpunit/tests/export/functions.export.php
diff --git a/tests/tests/export/writers.php b/tests/phpunit/tests/export/writers.php
index 9e4fb31793..9e4fb31793 100644
--- a/tests/tests/export/writers.php
+++ b/tests/phpunit/tests/export/writers.php
diff --git a/tests/tests/feed/rss2.php b/tests/phpunit/tests/feed/rss2.php
index dcbe349e0a..dcbe349e0a 100644
--- a/tests/tests/feed/rss2.php
+++ b/tests/phpunit/tests/feed/rss2.php
diff --git a/tests/tests/file.php b/tests/phpunit/tests/file.php
index 3c2fd8886d..3c2fd8886d 100644
--- a/tests/tests/file.php
+++ b/tests/phpunit/tests/file.php
diff --git a/tests/tests/filesystem/base.php b/tests/phpunit/tests/filesystem/base.php
index f13b46a10f..f13b46a10f 100644
--- a/tests/tests/filesystem/base.php
+++ b/tests/phpunit/tests/filesystem/base.php
diff --git a/tests/tests/filesystem/find_folder.php b/tests/phpunit/tests/filesystem/find_folder.php
index b623ac664b..b623ac664b 100644
--- a/tests/tests/filesystem/find_folder.php
+++ b/tests/phpunit/tests/filesystem/find_folder.php
diff --git a/tests/tests/filters.php b/tests/phpunit/tests/filters.php
index bb447a4041..bb447a4041 100644
--- a/tests/tests/filters.php
+++ b/tests/phpunit/tests/filters.php
diff --git a/tests/tests/formatting/Autop.php b/tests/phpunit/tests/formatting/Autop.php
index 7cd324f985..7cd324f985 100644
--- a/tests/tests/formatting/Autop.php
+++ b/tests/phpunit/tests/formatting/Autop.php
diff --git a/tests/tests/formatting/CleanPre.php b/tests/phpunit/tests/formatting/CleanPre.php
index fb5eea90df..fb5eea90df 100644
--- a/tests/tests/formatting/CleanPre.php
+++ b/tests/phpunit/tests/formatting/CleanPre.php
diff --git a/tests/tests/formatting/ConvertChars.php b/tests/phpunit/tests/formatting/ConvertChars.php
index a134572026..a134572026 100644
--- a/tests/tests/formatting/ConvertChars.php
+++ b/tests/phpunit/tests/formatting/ConvertChars.php
diff --git a/tests/tests/formatting/EscAttr.php b/tests/phpunit/tests/formatting/EscAttr.php
index 35ea2f54a5..35ea2f54a5 100644
--- a/tests/tests/formatting/EscAttr.php
+++ b/tests/phpunit/tests/formatting/EscAttr.php
diff --git a/tests/tests/formatting/EscHtml.php b/tests/phpunit/tests/formatting/EscHtml.php
index 101692622e..101692622e 100644
--- a/tests/tests/formatting/EscHtml.php
+++ b/tests/phpunit/tests/formatting/EscHtml.php
diff --git a/tests/tests/formatting/EscTextarea.php b/tests/phpunit/tests/formatting/EscTextarea.php
index dde90db098..dde90db098 100644
--- a/tests/tests/formatting/EscTextarea.php
+++ b/tests/phpunit/tests/formatting/EscTextarea.php
diff --git a/tests/tests/formatting/EscUrl.php b/tests/phpunit/tests/formatting/EscUrl.php
index 478d385fc7..478d385fc7 100644
--- a/tests/tests/formatting/EscUrl.php
+++ b/tests/phpunit/tests/formatting/EscUrl.php
diff --git a/tests/tests/formatting/HtmlExcerpt.php b/tests/phpunit/tests/formatting/HtmlExcerpt.php
index d117e7d405..d117e7d405 100644
--- a/tests/tests/formatting/HtmlExcerpt.php
+++ b/tests/phpunit/tests/formatting/HtmlExcerpt.php
diff --git a/tests/tests/formatting/IsEmail.php b/tests/phpunit/tests/formatting/IsEmail.php
index 583875248d..583875248d 100644
--- a/tests/tests/formatting/IsEmail.php
+++ b/tests/phpunit/tests/formatting/IsEmail.php
diff --git a/tests/tests/formatting/JSEscape.php b/tests/phpunit/tests/formatting/JSEscape.php
index 6ec3892982..6ec3892982 100644
--- a/tests/tests/formatting/JSEscape.php
+++ b/tests/phpunit/tests/formatting/JSEscape.php
diff --git a/tests/tests/formatting/LikeEscape.php b/tests/phpunit/tests/formatting/LikeEscape.php
index 7027bc7e40..7027bc7e40 100644
--- a/tests/tests/formatting/LikeEscape.php
+++ b/tests/phpunit/tests/formatting/LikeEscape.php
diff --git a/tests/tests/formatting/MakeClickable.php b/tests/phpunit/tests/formatting/MakeClickable.php
index 5639ce1b1d..5639ce1b1d 100644
--- a/tests/tests/formatting/MakeClickable.php
+++ b/tests/phpunit/tests/formatting/MakeClickable.php
diff --git a/tests/tests/formatting/MapDeep.php b/tests/phpunit/tests/formatting/MapDeep.php
index 8e000e4cc6..8e000e4cc6 100644
--- a/tests/tests/formatting/MapDeep.php
+++ b/tests/phpunit/tests/formatting/MapDeep.php
diff --git a/tests/tests/formatting/RemoveAccents.php b/tests/phpunit/tests/formatting/RemoveAccents.php
index ca8c503ab4..ca8c503ab4 100644
--- a/tests/tests/formatting/RemoveAccents.php
+++ b/tests/phpunit/tests/formatting/RemoveAccents.php
diff --git a/tests/tests/formatting/SanitizeFileName.php b/tests/phpunit/tests/formatting/SanitizeFileName.php
index e4f0824df7..e4f0824df7 100644
--- a/tests/tests/formatting/SanitizeFileName.php
+++ b/tests/phpunit/tests/formatting/SanitizeFileName.php
diff --git a/tests/tests/formatting/SanitizeMimeType.php b/tests/phpunit/tests/formatting/SanitizeMimeType.php
index fde7d820cf..fde7d820cf 100644
--- a/tests/tests/formatting/SanitizeMimeType.php
+++ b/tests/phpunit/tests/formatting/SanitizeMimeType.php
diff --git a/tests/tests/formatting/SanitizeOrderby.php b/tests/phpunit/tests/formatting/SanitizeOrderby.php
index 48ef66255b..48ef66255b 100644
--- a/tests/tests/formatting/SanitizeOrderby.php
+++ b/tests/phpunit/tests/formatting/SanitizeOrderby.php
diff --git a/tests/tests/formatting/SanitizePost.php b/tests/phpunit/tests/formatting/SanitizePost.php
index 5dad0beb25..5dad0beb25 100644
--- a/tests/tests/formatting/SanitizePost.php
+++ b/tests/phpunit/tests/formatting/SanitizePost.php
diff --git a/tests/tests/formatting/SanitizeTextField.php b/tests/phpunit/tests/formatting/SanitizeTextField.php
index 4cbcbbcdf2..4cbcbbcdf2 100644
--- a/tests/tests/formatting/SanitizeTextField.php
+++ b/tests/phpunit/tests/formatting/SanitizeTextField.php
diff --git a/tests/tests/formatting/SanitizeTitle.php b/tests/phpunit/tests/formatting/SanitizeTitle.php
index dce073b69f..dce073b69f 100644
--- a/tests/tests/formatting/SanitizeTitle.php
+++ b/tests/phpunit/tests/formatting/SanitizeTitle.php
diff --git a/tests/tests/formatting/SanitizeTitleWithDashes.php b/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php
index 53931bd173..53931bd173 100644
--- a/tests/tests/formatting/SanitizeTitleWithDashes.php
+++ b/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php
diff --git a/tests/tests/formatting/SanitizeTrackbackUrls.php b/tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php
index b70f71bb43..b70f71bb43 100644
--- a/tests/tests/formatting/SanitizeTrackbackUrls.php
+++ b/tests/phpunit/tests/formatting/SanitizeTrackbackUrls.php
diff --git a/tests/tests/formatting/SanitizeUser.php b/tests/phpunit/tests/formatting/SanitizeUser.php
index 3f7f03b34a..3f7f03b34a 100644
--- a/tests/tests/formatting/SanitizeUser.php
+++ b/tests/phpunit/tests/formatting/SanitizeUser.php
diff --git a/tests/tests/formatting/SeemsUtf8.php b/tests/phpunit/tests/formatting/SeemsUtf8.php
index d557295c3d..d557295c3d 100644
--- a/tests/tests/formatting/SeemsUtf8.php
+++ b/tests/phpunit/tests/formatting/SeemsUtf8.php
diff --git a/tests/tests/formatting/Slashit.php b/tests/phpunit/tests/formatting/Slashit.php
index 9db62a5f91..9db62a5f91 100644
--- a/tests/tests/formatting/Slashit.php
+++ b/tests/phpunit/tests/formatting/Slashit.php
diff --git a/tests/tests/formatting/Smilies.php b/tests/phpunit/tests/formatting/Smilies.php
index 5d9777479d..5d9777479d 100644
--- a/tests/tests/formatting/Smilies.php
+++ b/tests/phpunit/tests/formatting/Smilies.php
diff --git a/tests/tests/formatting/StripSlashesDeep.php b/tests/phpunit/tests/formatting/StripSlashesDeep.php
index d834f0f197..d834f0f197 100644
--- a/tests/tests/formatting/StripSlashesDeep.php
+++ b/tests/phpunit/tests/formatting/StripSlashesDeep.php
diff --git a/tests/tests/formatting/UrlEncodedToEntities.php b/tests/phpunit/tests/formatting/UrlEncodedToEntities.php
index 956f67173f..956f67173f 100644
--- a/tests/tests/formatting/UrlEncodedToEntities.php
+++ b/tests/phpunit/tests/formatting/UrlEncodedToEntities.php
diff --git a/tests/tests/formatting/Utf8UriEncode.php b/tests/phpunit/tests/formatting/Utf8UriEncode.php
index 2389c9a345..2389c9a345 100644
--- a/tests/tests/formatting/Utf8UriEncode.php
+++ b/tests/phpunit/tests/formatting/Utf8UriEncode.php
diff --git a/tests/tests/formatting/WPSpecialchars.php b/tests/phpunit/tests/formatting/WPSpecialchars.php
index 6c8765d4db..6c8765d4db 100644
--- a/tests/tests/formatting/WPSpecialchars.php
+++ b/tests/phpunit/tests/formatting/WPSpecialchars.php
diff --git a/tests/tests/formatting/WPTexturize.php b/tests/phpunit/tests/formatting/WPTexturize.php
index c44e176e72..c44e176e72 100644
--- a/tests/tests/formatting/WPTexturize.php
+++ b/tests/phpunit/tests/formatting/WPTexturize.php
diff --git a/tests/tests/formatting/WPTrimWords.php b/tests/phpunit/tests/formatting/WPTrimWords.php
index 4658bcf7f7..4658bcf7f7 100644
--- a/tests/tests/formatting/WPTrimWords.php
+++ b/tests/phpunit/tests/formatting/WPTrimWords.php
diff --git a/tests/tests/formatting/WpHtmlEditPre.php b/tests/phpunit/tests/formatting/WpHtmlEditPre.php
index 82c7531f69..82c7531f69 100644
--- a/tests/tests/formatting/WpHtmlEditPre.php
+++ b/tests/phpunit/tests/formatting/WpHtmlEditPre.php
diff --git a/tests/tests/formatting/WpRichEditPre.php b/tests/phpunit/tests/formatting/WpRichEditPre.php
index 06963c65e4..06963c65e4 100644
--- a/tests/tests/formatting/WpRichEditPre.php
+++ b/tests/phpunit/tests/formatting/WpRichEditPre.php
diff --git a/tests/tests/formatting/Zeroise.php b/tests/phpunit/tests/formatting/Zeroise.php
index be075c5bf6..be075c5bf6 100644
--- a/tests/tests/formatting/Zeroise.php
+++ b/tests/phpunit/tests/formatting/Zeroise.php
diff --git a/tests/tests/formatting/balanceTags.php b/tests/phpunit/tests/formatting/balanceTags.php
index de61b0bb6e..de61b0bb6e 100644
--- a/tests/tests/formatting/balanceTags.php
+++ b/tests/phpunit/tests/formatting/balanceTags.php
diff --git a/tests/tests/formatting/date.php b/tests/phpunit/tests/formatting/date.php
index c2a3cc64a4..c2a3cc64a4 100644
--- a/tests/tests/formatting/date.php
+++ b/tests/phpunit/tests/formatting/date.php
diff --git a/tests/tests/formatting/ent2ncr.php b/tests/phpunit/tests/formatting/ent2ncr.php
index c44e1afe76..c44e1afe76 100644
--- a/tests/tests/formatting/ent2ncr.php
+++ b/tests/phpunit/tests/formatting/ent2ncr.php
diff --git a/tests/tests/formatting/isoDescrambler.php b/tests/phpunit/tests/formatting/isoDescrambler.php
index 425997809d..425997809d 100644
--- a/tests/tests/formatting/isoDescrambler.php
+++ b/tests/phpunit/tests/formatting/isoDescrambler.php
diff --git a/tests/tests/formatting/redirect.php b/tests/phpunit/tests/formatting/redirect.php
index 97c8ec240c..97c8ec240c 100644
--- a/tests/tests/formatting/redirect.php
+++ b/tests/phpunit/tests/formatting/redirect.php
diff --git a/tests/tests/formatting/wp_basename.php b/tests/phpunit/tests/formatting/wp_basename.php
index 4200fb8656..4200fb8656 100644
--- a/tests/tests/formatting/wp_basename.php
+++ b/tests/phpunit/tests/formatting/wp_basename.php
diff --git a/tests/tests/functions.php b/tests/phpunit/tests/functions.php
index eee3054b96..eee3054b96 100644
--- a/tests/tests/functions.php
+++ b/tests/phpunit/tests/functions.php
diff --git a/tests/tests/functions/deprecated.php b/tests/phpunit/tests/functions/deprecated.php
index 0ffd194d8d..0ffd194d8d 100644
--- a/tests/tests/functions/deprecated.php
+++ b/tests/phpunit/tests/functions/deprecated.php
diff --git a/tests/tests/functions/listFilter.php b/tests/phpunit/tests/functions/listFilter.php
index ac1847b5a9..ac1847b5a9 100644
--- a/tests/tests/functions/listFilter.php
+++ b/tests/phpunit/tests/functions/listFilter.php
diff --git a/tests/tests/general/archives.php b/tests/phpunit/tests/general/archives.php
index 20a14d7583..20a14d7583 100644
--- a/tests/tests/general/archives.php
+++ b/tests/phpunit/tests/general/archives.php
diff --git a/tests/tests/http/base.php b/tests/phpunit/tests/http/base.php
index ddc24786b7..ddc24786b7 100644
--- a/tests/tests/http/base.php
+++ b/tests/phpunit/tests/http/base.php
diff --git a/tests/tests/http/curl.php b/tests/phpunit/tests/http/curl.php
index b9481ed6cb..b9481ed6cb 100644
--- a/tests/tests/http/curl.php
+++ b/tests/phpunit/tests/http/curl.php
diff --git a/tests/tests/http/fsockopen.php b/tests/phpunit/tests/http/fsockopen.php
index d36ebed73d..d36ebed73d 100644
--- a/tests/tests/http/fsockopen.php
+++ b/tests/phpunit/tests/http/fsockopen.php
diff --git a/tests/tests/http/functions.php b/tests/phpunit/tests/http/functions.php
index 1026e6b1b2..1026e6b1b2 100644
--- a/tests/tests/http/functions.php
+++ b/tests/phpunit/tests/http/functions.php
diff --git a/tests/tests/http/http.php b/tests/phpunit/tests/http/http.php
index 578d6e84a8..578d6e84a8 100644
--- a/tests/tests/http/http.php
+++ b/tests/phpunit/tests/http/http.php
diff --git a/tests/tests/http/streams.php b/tests/phpunit/tests/http/streams.php
index 2c6922f901..2c6922f901 100644
--- a/tests/tests/http/streams.php
+++ b/tests/phpunit/tests/http/streams.php
diff --git a/tests/tests/image/base.php b/tests/phpunit/tests/image/base.php
index 26f3b59d9a..26f3b59d9a 100644
--- a/tests/tests/image/base.php
+++ b/tests/phpunit/tests/image/base.php
diff --git a/tests/tests/image/dimensions.php b/tests/phpunit/tests/image/dimensions.php
index 3bb6fde19e..3bb6fde19e 100644
--- a/tests/tests/image/dimensions.php
+++ b/tests/phpunit/tests/image/dimensions.php
diff --git a/tests/tests/image/editor.php b/tests/phpunit/tests/image/editor.php
index b3ae47c2ff..b3ae47c2ff 100644
--- a/tests/tests/image/editor.php
+++ b/tests/phpunit/tests/image/editor.php
diff --git a/tests/tests/image/editor_gd.php b/tests/phpunit/tests/image/editor_gd.php
index f5fdd99651..f5fdd99651 100644
--- a/tests/tests/image/editor_gd.php
+++ b/tests/phpunit/tests/image/editor_gd.php
diff --git a/tests/tests/image/editor_imagick.php b/tests/phpunit/tests/image/editor_imagick.php
index 1e43298a54..1e43298a54 100644
--- a/tests/tests/image/editor_imagick.php
+++ b/tests/phpunit/tests/image/editor_imagick.php
diff --git a/tests/tests/image/functions.php b/tests/phpunit/tests/image/functions.php
index 3982f7bc5a..3982f7bc5a 100644
--- a/tests/tests/image/functions.php
+++ b/tests/phpunit/tests/image/functions.php
diff --git a/tests/tests/image/intermediate_size.php b/tests/phpunit/tests/image/intermediate_size.php
index 356b101afa..356b101afa 100644
--- a/tests/tests/image/intermediate_size.php
+++ b/tests/phpunit/tests/image/intermediate_size.php
diff --git a/tests/tests/image/meta.php b/tests/phpunit/tests/image/meta.php
index f51109c655..f51109c655 100644
--- a/tests/tests/image/meta.php
+++ b/tests/phpunit/tests/image/meta.php
diff --git a/tests/tests/image/resize.php b/tests/phpunit/tests/image/resize.php
index a4a6aaab2b..a4a6aaab2b 100644
--- a/tests/tests/image/resize.php
+++ b/tests/phpunit/tests/image/resize.php
diff --git a/tests/tests/image/resize_gd.php b/tests/phpunit/tests/image/resize_gd.php
index 7fe144b012..7fe144b012 100644
--- a/tests/tests/image/resize_gd.php
+++ b/tests/phpunit/tests/image/resize_gd.php
diff --git a/tests/tests/image/resize_imagick.php b/tests/phpunit/tests/image/resize_imagick.php
index 18c5f3c0ad..18c5f3c0ad 100644
--- a/tests/tests/image/resize_imagick.php
+++ b/tests/phpunit/tests/image/resize_imagick.php
diff --git a/tests/tests/image/size.php b/tests/phpunit/tests/image/size.php
index a55545ced6..a55545ced6 100644
--- a/tests/tests/image/size.php
+++ b/tests/phpunit/tests/image/size.php
diff --git a/tests/tests/import/base.php b/tests/phpunit/tests/import/base.php
index 31f054b8fe..31f054b8fe 100644
--- a/tests/tests/import/base.php
+++ b/tests/phpunit/tests/import/base.php
diff --git a/tests/tests/import/import.php b/tests/phpunit/tests/import/import.php
index 82d7fc6820..82d7fc6820 100644
--- a/tests/tests/import/import.php
+++ b/tests/phpunit/tests/import/import.php
diff --git a/tests/tests/import/parser.php b/tests/phpunit/tests/import/parser.php
index dc3dd79b1f..dc3dd79b1f 100644
--- a/tests/tests/import/parser.php
+++ b/tests/phpunit/tests/import/parser.php
diff --git a/tests/tests/import/postmeta.php b/tests/phpunit/tests/import/postmeta.php
index c21011446d..c21011446d 100644
--- a/tests/tests/import/postmeta.php
+++ b/tests/phpunit/tests/import/postmeta.php
diff --git a/tests/tests/includes/factory.php b/tests/phpunit/tests/includes/factory.php
index 34516861e6..34516861e6 100644
--- a/tests/tests/includes/factory.php
+++ b/tests/phpunit/tests/includes/factory.php
diff --git a/tests/tests/iterators.php b/tests/phpunit/tests/iterators.php
index 869106371c..869106371c 100644
--- a/tests/tests/iterators.php
+++ b/tests/phpunit/tests/iterators.php
diff --git a/tests/tests/kses.php b/tests/phpunit/tests/kses.php
index 6690797e9d..6690797e9d 100644
--- a/tests/tests/kses.php
+++ b/tests/phpunit/tests/kses.php
diff --git a/tests/tests/l10n.php b/tests/phpunit/tests/l10n.php
index f6ada8ac2b..f6ada8ac2b 100644
--- a/tests/tests/l10n.php
+++ b/tests/phpunit/tests/l10n.php
diff --git a/tests/tests/link.php b/tests/phpunit/tests/link.php
index 13ab21f176..13ab21f176 100644
--- a/tests/tests/link.php
+++ b/tests/phpunit/tests/link.php
diff --git a/tests/tests/mail.php b/tests/phpunit/tests/mail.php
index 425fed5b0d..425fed5b0d 100644
--- a/tests/tests/mail.php
+++ b/tests/phpunit/tests/mail.php
diff --git a/tests/tests/media.php b/tests/phpunit/tests/media.php
index 9066fdc5ed..9066fdc5ed 100644
--- a/tests/tests/media.php
+++ b/tests/phpunit/tests/media.php
diff --git a/tests/tests/meta.php b/tests/phpunit/tests/meta.php
index 679f78614c..679f78614c 100644
--- a/tests/tests/meta.php
+++ b/tests/phpunit/tests/meta.php
diff --git a/tests/tests/meta/query.php b/tests/phpunit/tests/meta/query.php
index 88ce2c8c20..88ce2c8c20 100644
--- a/tests/tests/meta/query.php
+++ b/tests/phpunit/tests/meta/query.php
diff --git a/tests/tests/meta/slashes.php b/tests/phpunit/tests/meta/slashes.php
index bcd59ba6a0..bcd59ba6a0 100644
--- a/tests/tests/meta/slashes.php
+++ b/tests/phpunit/tests/meta/slashes.php
diff --git a/tests/tests/ms.php b/tests/phpunit/tests/ms.php
index 43fa94ed60..43fa94ed60 100644
--- a/tests/tests/ms.php
+++ b/tests/phpunit/tests/ms.php
diff --git a/tests/tests/option/blogOption.php b/tests/phpunit/tests/option/blogOption.php
index d769ba43d4..d769ba43d4 100644
--- a/tests/tests/option/blogOption.php
+++ b/tests/phpunit/tests/option/blogOption.php
diff --git a/tests/tests/option/option.php b/tests/phpunit/tests/option/option.php
index a866cea8ab..a866cea8ab 100644
--- a/tests/tests/option/option.php
+++ b/tests/phpunit/tests/option/option.php
diff --git a/tests/tests/option/siteOption.php b/tests/phpunit/tests/option/siteOption.php
index 47bef17c42..47bef17c42 100644
--- a/tests/tests/option/siteOption.php
+++ b/tests/phpunit/tests/option/siteOption.php
diff --git a/tests/tests/option/siteTransient.php b/tests/phpunit/tests/option/siteTransient.php
index 621b2c1b31..621b2c1b31 100644
--- a/tests/tests/option/siteTransient.php
+++ b/tests/phpunit/tests/option/siteTransient.php
diff --git a/tests/tests/option/slashes.php b/tests/phpunit/tests/option/slashes.php
index ece4f85ca8..ece4f85ca8 100644
--- a/tests/tests/option/slashes.php
+++ b/tests/phpunit/tests/option/slashes.php
diff --git a/tests/tests/option/transient.php b/tests/phpunit/tests/option/transient.php
index 1d9c64fb6d..1d9c64fb6d 100644
--- a/tests/tests/option/transient.php
+++ b/tests/phpunit/tests/option/transient.php
diff --git a/tests/tests/pomo/mo.php b/tests/phpunit/tests/pomo/mo.php
index f68791f774..f68791f774 100644
--- a/tests/tests/pomo/mo.php
+++ b/tests/phpunit/tests/pomo/mo.php
diff --git a/tests/tests/pomo/noopTranslations.php b/tests/phpunit/tests/pomo/noopTranslations.php
index 8ac2b9c83f..8ac2b9c83f 100644
--- a/tests/tests/pomo/noopTranslations.php
+++ b/tests/phpunit/tests/pomo/noopTranslations.php
diff --git a/tests/tests/pomo/po.php b/tests/phpunit/tests/pomo/po.php
index 7af41b744f..7af41b744f 100644
--- a/tests/tests/pomo/po.php
+++ b/tests/phpunit/tests/pomo/po.php
diff --git a/tests/tests/pomo/translationEntry.php b/tests/phpunit/tests/pomo/translationEntry.php
index 0f352f1f4b..0f352f1f4b 100644
--- a/tests/tests/pomo/translationEntry.php
+++ b/tests/phpunit/tests/pomo/translationEntry.php
diff --git a/tests/tests/pomo/translations.php b/tests/phpunit/tests/pomo/translations.php
index d89548f937..d89548f937 100644
--- a/tests/tests/pomo/translations.php
+++ b/tests/phpunit/tests/pomo/translations.php
diff --git a/tests/tests/post.php b/tests/phpunit/tests/post.php
index 6b3d8d59f6..6b3d8d59f6 100644
--- a/tests/tests/post.php
+++ b/tests/phpunit/tests/post.php
diff --git a/tests/tests/post/attachments.php b/tests/phpunit/tests/post/attachments.php
index 89854edd3e..89854edd3e 100644
--- a/tests/tests/post/attachments.php
+++ b/tests/phpunit/tests/post/attachments.php
diff --git a/tests/tests/post/filtering.php b/tests/phpunit/tests/post/filtering.php
index fff1b20304..fff1b20304 100644
--- a/tests/tests/post/filtering.php
+++ b/tests/phpunit/tests/post/filtering.php
diff --git a/tests/tests/post/formats.php b/tests/phpunit/tests/post/formats.php
index 705a2f361f..705a2f361f 100644
--- a/tests/tests/post/formats.php
+++ b/tests/phpunit/tests/post/formats.php
diff --git a/tests/tests/post/gallery.php b/tests/phpunit/tests/post/gallery.php
index d4ece6cf6a..d4ece6cf6a 100644
--- a/tests/tests/post/gallery.php
+++ b/tests/phpunit/tests/post/gallery.php
diff --git a/tests/tests/post/getPages.php b/tests/phpunit/tests/post/getPages.php
index 8b660252e1..8b660252e1 100644
--- a/tests/tests/post/getPages.php
+++ b/tests/phpunit/tests/post/getPages.php
diff --git a/tests/tests/post/meta.php b/tests/phpunit/tests/post/meta.php
index 572aa8ad77..572aa8ad77 100644
--- a/tests/tests/post/meta.php
+++ b/tests/phpunit/tests/post/meta.php
diff --git a/tests/tests/post/nav-menu.php b/tests/phpunit/tests/post/nav-menu.php
index 00912879f6..00912879f6 100644
--- a/tests/tests/post/nav-menu.php
+++ b/tests/phpunit/tests/post/nav-menu.php
diff --git a/tests/tests/post/objects.php b/tests/phpunit/tests/post/objects.php
index e98098d2ac..e98098d2ac 100644
--- a/tests/tests/post/objects.php
+++ b/tests/phpunit/tests/post/objects.php
diff --git a/tests/tests/post/output.php b/tests/phpunit/tests/post/output.php
index fcac5e4fed..fcac5e4fed 100644
--- a/tests/tests/post/output.php
+++ b/tests/phpunit/tests/post/output.php
diff --git a/tests/tests/post/query.php b/tests/phpunit/tests/post/query.php
index 9f42485a5d..9f42485a5d 100644
--- a/tests/tests/post/query.php
+++ b/tests/phpunit/tests/post/query.php
diff --git a/tests/tests/post/revisions.php b/tests/phpunit/tests/post/revisions.php
index 49e4f84948..49e4f84948 100644
--- a/tests/tests/post/revisions.php
+++ b/tests/phpunit/tests/post/revisions.php
diff --git a/tests/tests/post/slashes.php b/tests/phpunit/tests/post/slashes.php
index c74aebe318..c74aebe318 100644
--- a/tests/tests/post/slashes.php
+++ b/tests/phpunit/tests/post/slashes.php
diff --git a/tests/tests/post/types.php b/tests/phpunit/tests/post/types.php
index 0c8d95d298..0c8d95d298 100644
--- a/tests/tests/post/types.php
+++ b/tests/phpunit/tests/post/types.php
diff --git a/tests/tests/query.php b/tests/phpunit/tests/query.php
index 1c682304d0..1c682304d0 100644
--- a/tests/tests/query.php
+++ b/tests/phpunit/tests/query.php
diff --git a/tests/tests/query/conditionals.php b/tests/phpunit/tests/query/conditionals.php
index 980180789f..980180789f 100644
--- a/tests/tests/query/conditionals.php
+++ b/tests/phpunit/tests/query/conditionals.php
diff --git a/tests/tests/query/date.php b/tests/phpunit/tests/query/date.php
index 3e3d848e63..3e3d848e63 100644
--- a/tests/tests/query/date.php
+++ b/tests/phpunit/tests/query/date.php
diff --git a/tests/tests/query/dateQuery.php b/tests/phpunit/tests/query/dateQuery.php
index 47cc71d563..47cc71d563 100644
--- a/tests/tests/query/dateQuery.php
+++ b/tests/phpunit/tests/query/dateQuery.php
diff --git a/tests/tests/query/results.php b/tests/phpunit/tests/query/results.php
index 34ca0db201..34ca0db201 100644
--- a/tests/tests/query/results.php
+++ b/tests/phpunit/tests/query/results.php
diff --git a/tests/tests/query/verboseRewriteRules.php b/tests/phpunit/tests/query/verboseRewriteRules.php
index 4918e751cb..4918e751cb 100644
--- a/tests/tests/query/verboseRewriteRules.php
+++ b/tests/phpunit/tests/query/verboseRewriteRules.php
diff --git a/tests/tests/shortcode.php b/tests/phpunit/tests/shortcode.php
index 89100662aa..89100662aa 100644
--- a/tests/tests/shortcode.php
+++ b/tests/phpunit/tests/shortcode.php
diff --git a/tests/tests/taxonomy.php b/tests/phpunit/tests/taxonomy.php
index 8c2748258a..8c2748258a 100644
--- a/tests/tests/taxonomy.php
+++ b/tests/phpunit/tests/taxonomy.php
diff --git a/tests/tests/term.php b/tests/phpunit/tests/term.php
index e32894fbe1..e32894fbe1 100644
--- a/tests/tests/term.php
+++ b/tests/phpunit/tests/term.php
diff --git a/tests/tests/term/getTerms.php b/tests/phpunit/tests/term/getTerms.php
index 2a946be693..2a946be693 100644
--- a/tests/tests/term/getTerms.php
+++ b/tests/phpunit/tests/term/getTerms.php
diff --git a/tests/tests/term/slashes.php b/tests/phpunit/tests/term/slashes.php
index c597312f16..c597312f16 100644
--- a/tests/tests/term/slashes.php
+++ b/tests/phpunit/tests/term/slashes.php
diff --git a/tests/tests/theme.php b/tests/phpunit/tests/theme.php
index 3f11ad1e26..3f11ad1e26 100644
--- a/tests/tests/theme.php
+++ b/tests/phpunit/tests/theme.php
diff --git a/tests/tests/theme/WPTheme.php b/tests/phpunit/tests/theme/WPTheme.php
index 1b60e29852..1b60e29852 100644
--- a/tests/tests/theme/WPTheme.php
+++ b/tests/phpunit/tests/theme/WPTheme.php
diff --git a/tests/tests/theme/support.php b/tests/phpunit/tests/theme/support.php
index 881052c9ae..881052c9ae 100644
--- a/tests/tests/theme/support.php
+++ b/tests/phpunit/tests/theme/support.php
diff --git a/tests/tests/theme/themeDir.php b/tests/phpunit/tests/theme/themeDir.php
index 11cf60018b..11cf60018b 100644
--- a/tests/tests/theme/themeDir.php
+++ b/tests/phpunit/tests/theme/themeDir.php
diff --git a/tests/tests/upload.php b/tests/phpunit/tests/upload.php
index 48947d8678..48947d8678 100644
--- a/tests/tests/upload.php
+++ b/tests/phpunit/tests/upload.php
diff --git a/tests/tests/url.php b/tests/phpunit/tests/url.php
index 4b4121e9c4..4b4121e9c4 100644
--- a/tests/tests/url.php
+++ b/tests/phpunit/tests/url.php
diff --git a/tests/tests/user.php b/tests/phpunit/tests/user.php
index 6ead4590e2..6ead4590e2 100644
--- a/tests/tests/user.php
+++ b/tests/phpunit/tests/user.php
diff --git a/tests/tests/user/author.php b/tests/phpunit/tests/user/author.php
index 67b9aba756..67b9aba756 100644
--- a/tests/tests/user/author.php
+++ b/tests/phpunit/tests/user/author.php
diff --git a/tests/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php
index d95af16b7f..d95af16b7f 100644
--- a/tests/tests/user/capabilities.php
+++ b/tests/phpunit/tests/user/capabilities.php
diff --git a/tests/tests/user/mapMetaCap.php b/tests/phpunit/tests/user/mapMetaCap.php
index 43ee079e70..43ee079e70 100644
--- a/tests/tests/user/mapMetaCap.php
+++ b/tests/phpunit/tests/user/mapMetaCap.php
diff --git a/tests/tests/user/query.php b/tests/phpunit/tests/user/query.php
index e40a8b5d4d..e40a8b5d4d 100644
--- a/tests/tests/user/query.php
+++ b/tests/phpunit/tests/user/query.php
diff --git a/tests/tests/user/slashes.php b/tests/phpunit/tests/user/slashes.php
index c50567ff60..c50567ff60 100644
--- a/tests/tests/user/slashes.php
+++ b/tests/phpunit/tests/user/slashes.php
diff --git a/tests/tests/widgets.php b/tests/phpunit/tests/widgets.php
index f84ba3e953..f84ba3e953 100644
--- a/tests/tests/widgets.php
+++ b/tests/phpunit/tests/widgets.php
diff --git a/tests/tests/xmlrpc/basic.php b/tests/phpunit/tests/xmlrpc/basic.php
index abfacc22c6..abfacc22c6 100644
--- a/tests/tests/xmlrpc/basic.php
+++ b/tests/phpunit/tests/xmlrpc/basic.php
diff --git a/tests/tests/xmlrpc/mt/getRecentPostTitles.php b/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php
index e08e2752ec..e08e2752ec 100644
--- a/tests/tests/xmlrpc/mt/getRecentPostTitles.php
+++ b/tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php
diff --git a/tests/tests/xmlrpc/mw/editPost.php b/tests/phpunit/tests/xmlrpc/mw/editPost.php
index 78b5f06e25..78b5f06e25 100644
--- a/tests/tests/xmlrpc/mw/editPost.php
+++ b/tests/phpunit/tests/xmlrpc/mw/editPost.php
diff --git a/tests/tests/xmlrpc/mw/getPost.php b/tests/phpunit/tests/xmlrpc/mw/getPost.php
index 60797a09cd..60797a09cd 100644
--- a/tests/tests/xmlrpc/mw/getPost.php
+++ b/tests/phpunit/tests/xmlrpc/mw/getPost.php
diff --git a/tests/tests/xmlrpc/mw/getRecentPosts.php b/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php
index 7ad89fdd30..7ad89fdd30 100644
--- a/tests/tests/xmlrpc/mw/getRecentPosts.php
+++ b/tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php
diff --git a/tests/tests/xmlrpc/mw/newPost.php b/tests/phpunit/tests/xmlrpc/mw/newPost.php
index b227cb6594..b227cb6594 100644
--- a/tests/tests/xmlrpc/mw/newPost.php
+++ b/tests/phpunit/tests/xmlrpc/mw/newPost.php
diff --git a/tests/tests/xmlrpc/wp/deletePost.php b/tests/phpunit/tests/xmlrpc/wp/deletePost.php
index fdddcf0538..fdddcf0538 100644
--- a/tests/tests/xmlrpc/wp/deletePost.php
+++ b/tests/phpunit/tests/xmlrpc/wp/deletePost.php
diff --git a/tests/tests/xmlrpc/wp/deleteTerm.php b/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php
index fbb4a41ba6..fbb4a41ba6 100644
--- a/tests/tests/xmlrpc/wp/deleteTerm.php
+++ b/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php
diff --git a/tests/tests/xmlrpc/wp/editPost.php b/tests/phpunit/tests/xmlrpc/wp/editPost.php
index 3bbd366558..3bbd366558 100644
--- a/tests/tests/xmlrpc/wp/editPost.php
+++ b/tests/phpunit/tests/xmlrpc/wp/editPost.php
diff --git a/tests/tests/xmlrpc/wp/editProfile.php b/tests/phpunit/tests/xmlrpc/wp/editProfile.php
index bb6dd47e59..bb6dd47e59 100644
--- a/tests/tests/xmlrpc/wp/editProfile.php
+++ b/tests/phpunit/tests/xmlrpc/wp/editProfile.php
diff --git a/tests/tests/xmlrpc/wp/editTerm.php b/tests/phpunit/tests/xmlrpc/wp/editTerm.php
index 9f9679d6ed..9f9679d6ed 100644
--- a/tests/tests/xmlrpc/wp/editTerm.php
+++ b/tests/phpunit/tests/xmlrpc/wp/editTerm.php
diff --git a/tests/tests/xmlrpc/wp/getComment.php b/tests/phpunit/tests/xmlrpc/wp/getComment.php
index 4a377739e2..4a377739e2 100644
--- a/tests/tests/xmlrpc/wp/getComment.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getComment.php
diff --git a/tests/tests/xmlrpc/wp/getComments.php b/tests/phpunit/tests/xmlrpc/wp/getComments.php
index 59970dc6b4..59970dc6b4 100644
--- a/tests/tests/xmlrpc/wp/getComments.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getComments.php
diff --git a/tests/tests/xmlrpc/wp/getMediaItem.php b/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php
index e08fdc3460..e08fdc3460 100644
--- a/tests/tests/xmlrpc/wp/getMediaItem.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php
diff --git a/tests/tests/xmlrpc/wp/getOptions.php b/tests/phpunit/tests/xmlrpc/wp/getOptions.php
index 8b095f65c5..8b095f65c5 100644
--- a/tests/tests/xmlrpc/wp/getOptions.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getOptions.php
diff --git a/tests/tests/xmlrpc/wp/getPage.php b/tests/phpunit/tests/xmlrpc/wp/getPage.php
index 1dc860d4fb..1dc860d4fb 100644
--- a/tests/tests/xmlrpc/wp/getPage.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getPage.php
diff --git a/tests/tests/xmlrpc/wp/getPageList.php b/tests/phpunit/tests/xmlrpc/wp/getPageList.php
index 9fe620c093..9fe620c093 100644
--- a/tests/tests/xmlrpc/wp/getPageList.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getPageList.php
diff --git a/tests/tests/xmlrpc/wp/getPages.php b/tests/phpunit/tests/xmlrpc/wp/getPages.php
index 0c250486fe..0c250486fe 100644
--- a/tests/tests/xmlrpc/wp/getPages.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getPages.php
diff --git a/tests/tests/xmlrpc/wp/getPost.php b/tests/phpunit/tests/xmlrpc/wp/getPost.php
index 489e8b923b..489e8b923b 100644
--- a/tests/tests/xmlrpc/wp/getPost.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getPost.php
diff --git a/tests/tests/xmlrpc/wp/getPostType.php b/tests/phpunit/tests/xmlrpc/wp/getPostType.php
index a00dbda3f7..a00dbda3f7 100644
--- a/tests/tests/xmlrpc/wp/getPostType.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getPostType.php
diff --git a/tests/tests/xmlrpc/wp/getPostTypes.php b/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php
index ae78a5db51..ae78a5db51 100644
--- a/tests/tests/xmlrpc/wp/getPostTypes.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getPostTypes.php
diff --git a/tests/tests/xmlrpc/wp/getPosts.php b/tests/phpunit/tests/xmlrpc/wp/getPosts.php
index c001d7a249..c001d7a249 100644
--- a/tests/tests/xmlrpc/wp/getPosts.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getPosts.php
diff --git a/tests/tests/xmlrpc/wp/getProfile.php b/tests/phpunit/tests/xmlrpc/wp/getProfile.php
index 834dcfba8f..834dcfba8f 100644
--- a/tests/tests/xmlrpc/wp/getProfile.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getProfile.php
diff --git a/tests/tests/xmlrpc/wp/getRevisions.php b/tests/phpunit/tests/xmlrpc/wp/getRevisions.php
index 1b013510ba..1b013510ba 100644
--- a/tests/tests/xmlrpc/wp/getRevisions.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getRevisions.php
diff --git a/tests/tests/xmlrpc/wp/getTaxonomies.php b/tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php
index cd2c86e3cc..cd2c86e3cc 100644
--- a/tests/tests/xmlrpc/wp/getTaxonomies.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getTaxonomies.php
diff --git a/tests/tests/xmlrpc/wp/getTaxonomy.php b/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php
index 6fc9ebf718..6fc9ebf718 100644
--- a/tests/tests/xmlrpc/wp/getTaxonomy.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php
diff --git a/tests/tests/xmlrpc/wp/getTerm.php b/tests/phpunit/tests/xmlrpc/wp/getTerm.php
index aec325e6cf..aec325e6cf 100644
--- a/tests/tests/xmlrpc/wp/getTerm.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getTerm.php
diff --git a/tests/tests/xmlrpc/wp/getTerms.php b/tests/phpunit/tests/xmlrpc/wp/getTerms.php
index 57537e8374..57537e8374 100644
--- a/tests/tests/xmlrpc/wp/getTerms.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getTerms.php
diff --git a/tests/tests/xmlrpc/wp/getUser.php b/tests/phpunit/tests/xmlrpc/wp/getUser.php
index 75c3b278d5..75c3b278d5 100644
--- a/tests/tests/xmlrpc/wp/getUser.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getUser.php
diff --git a/tests/tests/xmlrpc/wp/getUsers.php b/tests/phpunit/tests/xmlrpc/wp/getUsers.php
index 546273eb48..546273eb48 100644
--- a/tests/tests/xmlrpc/wp/getUsers.php
+++ b/tests/phpunit/tests/xmlrpc/wp/getUsers.php
diff --git a/tests/tests/xmlrpc/wp/newPost.php b/tests/phpunit/tests/xmlrpc/wp/newPost.php
index 1b775e56fb..1b775e56fb 100644
--- a/tests/tests/xmlrpc/wp/newPost.php
+++ b/tests/phpunit/tests/xmlrpc/wp/newPost.php
diff --git a/tests/tests/xmlrpc/wp/newTerm.php b/tests/phpunit/tests/xmlrpc/wp/newTerm.php
index ef96d193fd..ef96d193fd 100644
--- a/tests/tests/xmlrpc/wp/newTerm.php
+++ b/tests/phpunit/tests/xmlrpc/wp/newTerm.php
diff --git a/tests/tests/xmlrpc/wp/restoreRevision.php b/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php
index febd17c3e4..febd17c3e4 100644
--- a/tests/tests/xmlrpc/wp/restoreRevision.php
+++ b/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php
diff --git a/tests/tests/xmlrpc/wp/uploadFile.php b/tests/phpunit/tests/xmlrpc/wp/uploadFile.php
index 7b68a01afd..7b68a01afd 100644
--- a/tests/tests/xmlrpc/wp/uploadFile.php
+++ b/tests/phpunit/tests/xmlrpc/wp/uploadFile.php
diff --git a/tests/wp-mail-real-test.php b/tests/phpunit/wp-mail-real-test.php
index a3b4826b5a..a3b4826b5a 100644
--- a/tests/wp-mail-real-test.php
+++ b/tests/phpunit/wp-mail-real-test.php
diff --git a/tests/wp-tests-config-sample.php b/wp-tests-config-sample.php
index c1474c25f3..e6f0e1e1ed 100644
--- a/tests/wp-tests-config-sample.php
+++ b/wp-tests-config-sample.php
@@ -1,7 +1,7 @@
 <?php
 
 /* Path to the WordPress codebase you'd like to test. Add a backslash in the end. */
-define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/src/' );
+define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
 
 // Test with multisite enabled: (previously -m)
 // define( 'WP_TESTS_MULTISITE', true );