diff --git a/.gitignore b/.gitignore
index 1ba26feec92..c3130902dd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,9 @@
 /build/binary-phar-autoload.php
 /cache.properties
 /composer.lock
-/tests/TextUI/*.diff
-/tests/TextUI/*.exp
-/tests/TextUI/*.log
-/tests/TextUI/*.out
-/tests/TextUI/*.php
+/tests/end-to-end/*.diff
+/tests/end-to-end/*.exp
+/tests/end-to-end/*.log
+/tests/end-to-end/*.out
+/tests/end-to-end/*.php
 /vendor
diff --git a/build/travis-ci-fail.xml b/build/travis-ci-fail.xml
index 45869893bbf..af071f767ef 100644
--- a/build/travis-ci-fail.xml
+++ b/build/travis-ci-fail.xml
@@ -6,7 +6,7 @@
          verbose="true">
   <testsuites>
     <testsuite name="small">
-      <directory suffix=".phpt">../tests/Fail</directory>
+      <directory suffix=".phpt">../tests/fail</directory>
     </testsuite>
   </testsuites>
 
diff --git a/phpunit.xml b/phpunit.xml
index f3ea886d3b7..710a7ddf8c2 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -5,16 +5,12 @@
          cacheResult="true"
          verbose="true">
     <testsuites>
-        <testsuite name="small">
-            <directory>tests/Framework</directory>
-            <directory>tests/Runner</directory>
-            <directory>tests/Util</directory>
+        <testsuite name="unit">
+            <directory suffix="Test.php">tests/unit</directory>
         </testsuite>
 
-        <testsuite name="large">
-            <directory suffix=".phpt">tests/Framework/MockObject/Generator</directory>
-            <directory suffix=".phpt">tests/TextUI</directory>
-            <directory suffix=".phpt">tests/Regression</directory>
+        <testsuite name="end-to-end">
+            <directory suffix=".phpt">tests/end-to-end</directory>
         </testsuite>
     </testsuites>
 
diff --git a/tests/_files/configuration.one-file-suite.xml b/tests/_files/configuration.one-file-suite.xml
index bc8dfa1248f..4eddce62e92 100644
--- a/tests/_files/configuration.one-file-suite.xml
+++ b/tests/_files/configuration.one-file-suite.xml
@@ -1,7 +1,7 @@
 <phpunit>
     <testsuites>
         <testsuite name="One File Suite">
-            <file>../../tests/TextUI/debug.phpt</file>
+            <file>../../tests/end-to-end/debug.phpt</file>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/TextUI/_files/Extension.php b/tests/end-to-end/_files/Extension.php
similarity index 100%
rename from tests/TextUI/_files/Extension.php
rename to tests/end-to-end/_files/Extension.php
diff --git a/tests/TextUI/_files/HookTest.php b/tests/end-to-end/_files/HookTest.php
similarity index 100%
rename from tests/TextUI/_files/HookTest.php
rename to tests/end-to-end/_files/HookTest.php
diff --git a/tests/TextUI/_files/NullPrinter.php b/tests/end-to-end/_files/NullPrinter.php
similarity index 100%
rename from tests/TextUI/_files/NullPrinter.php
rename to tests/end-to-end/_files/NullPrinter.php
diff --git a/tests/TextUI/_files/expect_external.txt b/tests/end-to-end/_files/expect_external.txt
similarity index 100%
rename from tests/TextUI/_files/expect_external.txt
rename to tests/end-to-end/_files/expect_external.txt
diff --git a/tests/TextUI/_files/hooks.xml b/tests/end-to-end/_files/hooks.xml
similarity index 100%
rename from tests/TextUI/_files/hooks.xml
rename to tests/end-to-end/_files/hooks.xml
diff --git a/tests/TextUI/_files/phpt-env.expected.txt b/tests/end-to-end/_files/phpt-env.expected.txt
similarity index 100%
rename from tests/TextUI/_files/phpt-env.expected.txt
rename to tests/end-to-end/_files/phpt-env.expected.txt
diff --git a/tests/TextUI/_files/phpt_external.php b/tests/end-to-end/_files/phpt_external.php
similarity index 100%
rename from tests/TextUI/_files/phpt_external.php
rename to tests/end-to-end/_files/phpt_external.php
diff --git a/tests/TextUI/abstract-test-class.phpt b/tests/end-to-end/abstract-test-class.phpt
similarity index 91%
rename from tests/TextUI/abstract-test-class.phpt
rename to tests/end-to-end/abstract-test-class.phpt
index 41535e64b71..bc61c8e9ff3 100644
--- a/tests/TextUI/abstract-test-class.phpt
+++ b/tests/end-to-end/abstract-test-class.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit AbstractTest ../_files/AbstractTest.php
+phpunit AbstractTest ../../_files/AbstractTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/assertion.phpt b/tests/end-to-end/assertion.phpt
similarity index 92%
rename from tests/TextUI/assertion.phpt
rename to tests/end-to-end/assertion.phpt
index f9306fb8cd6..8e40be21626 100644
--- a/tests/TextUI/assertion.phpt
+++ b/tests/end-to-end/assertion.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit AssertionExampleTest ../_files/AssertionExampleTest.php
+phpunit AssertionExampleTest ../../_files/AssertionExampleTest.php
 --SKIPIF--
 <?php
 if (PHP_MAJOR_VERSION < 7) {
diff --git a/tests/TextUI/cache-result.phpt b/tests/end-to-end/cache-result.phpt
similarity index 100%
rename from tests/TextUI/cache-result.phpt
rename to tests/end-to-end/cache-result.phpt
diff --git a/tests/TextUI/code-coverage-ignore.phpt b/tests/end-to-end/code-coverage-ignore.phpt
similarity index 87%
rename from tests/TextUI/code-coverage-ignore.phpt
rename to tests/end-to-end/code-coverage-ignore.phpt
index f6ca35a5312..25541c2eddd 100644
--- a/tests/TextUI/code-coverage-ignore.phpt
+++ b/tests/end-to-end/code-coverage-ignore.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout IgnoreCodeCoverageClassTest ../_files/IgnoreCodeCoverageClassTest.php --whitelist ../../tests/_files/IgnoreCodeCoverageClass.php
+phpunit --colors=never --coverage-text=php://stdout IgnoreCodeCoverageClassTest ../../_files/IgnoreCodeCoverageClassTest.php --whitelist ../../../tests/_files/IgnoreCodeCoverageClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {
diff --git a/tests/TextUI/code-coverage-phpt.phpt b/tests/end-to-end/code-coverage-phpt.phpt
similarity index 89%
rename from tests/TextUI/code-coverage-phpt.phpt
rename to tests/end-to-end/code-coverage-phpt.phpt
index c32817b7be5..7e6dee49854 100644
--- a/tests/TextUI/code-coverage-phpt.phpt
+++ b/tests/end-to-end/code-coverage-phpt.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout ../_files/phpt-for-coverage.phpt --whitelist ../_files/CoveredClass.php
+phpunit --colors=never --coverage-text=php://stdout ../../_files/phpt-for-coverage.phpt --whitelist ../../_files/CoveredClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {
diff --git a/tests/TextUI/colors-always.phpt b/tests/end-to-end/colors-always.phpt
similarity index 86%
rename from tests/TextUI/colors-always.phpt
rename to tests/end-to-end/colors-always.phpt
index 792824d76ee..ba8c74b8070 100644
--- a/tests/TextUI/colors-always.phpt
+++ b/tests/end-to-end/colors-always.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=always BankAccountTest ../_files/BankAccountTest.php
+phpunit --colors=always BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/concrete-test-class.phpt b/tests/end-to-end/concrete-test-class.phpt
similarity index 89%
rename from tests/TextUI/concrete-test-class.phpt
rename to tests/end-to-end/concrete-test-class.phpt
index ffbb6abf6e1..fa310965121 100644
--- a/tests/TextUI/concrete-test-class.phpt
+++ b/tests/end-to-end/concrete-test-class.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit ConcreteTest ../_files/ConcreteTest.php
+phpunit ConcreteTest ../../_files/ConcreteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/custom-printer-debug.phpt b/tests/end-to-end/custom-printer-debug.phpt
similarity index 87%
rename from tests/TextUI/custom-printer-debug.phpt
rename to tests/end-to-end/custom-printer-debug.phpt
index 86e8988d5bf..e30227a5cd8 100644
--- a/tests/TextUI/custom-printer-debug.phpt
+++ b/tests/end-to-end/custom-printer-debug.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration.custom-printer.xml --debug BankAccountTest ../_files/BankAccountTest.php
+phpunit -c ../../_files/configuration.custom-printer.xml --debug BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/tests/TextUI/custom-printer-verbose.phpt b/tests/end-to-end/custom-printer-verbose.phpt
similarity index 86%
rename from tests/TextUI/custom-printer-verbose.phpt
rename to tests/end-to-end/custom-printer-verbose.phpt
index 06ed19d8786..32c7d57b7bd 100644
--- a/tests/TextUI/custom-printer-verbose.phpt
+++ b/tests/end-to-end/custom-printer-verbose.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration.custom-printer.xml --verbose IncompleteTest ../_files/IncompleteTest.php
+phpunit -c ../../_files/configuration.custom-printer.xml --verbose IncompleteTest ../../_files/IncompleteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/tests/TextUI/dataprovider-debug.phpt b/tests/end-to-end/dataprovider-debug.phpt
similarity index 96%
rename from tests/TextUI/dataprovider-debug.phpt
rename to tests/end-to-end/dataprovider-debug.phpt
index 72e573a1e74..d7ec8f886a4 100644
--- a/tests/TextUI/dataprovider-debug.phpt
+++ b/tests/end-to-end/dataprovider-debug.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --debug DataProviderDebugTest ../_files/DataProviderDebugTest.php
+phpunit --debug DataProviderDebugTest ../../_files/DataProviderDebugTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dataprovider-issue-2833.phpt b/tests/end-to-end/dataprovider-issue-2833.phpt
similarity index 90%
rename from tests/TextUI/dataprovider-issue-2833.phpt
rename to tests/end-to-end/dataprovider-issue-2833.phpt
index e1d55b1aa8c..5b680f284b8 100644
--- a/tests/TextUI/dataprovider-issue-2833.phpt
+++ b/tests/end-to-end/dataprovider-issue-2833.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit ../_files/DataProviderIssue2833
+phpunit ../../_files/DataProviderIssue2833
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dataprovider-issue-2859.phpt b/tests/end-to-end/dataprovider-issue-2859.phpt
similarity index 87%
rename from tests/TextUI/dataprovider-issue-2859.phpt
rename to tests/end-to-end/dataprovider-issue-2859.phpt
index c6e8ed66cc7..e784c7767be 100644
--- a/tests/TextUI/dataprovider-issue-2859.phpt
+++ b/tests/end-to-end/dataprovider-issue-2859.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/DataProviderIssue2859/phpunit.xml
+phpunit -c ../../_files/DataProviderIssue2859/phpunit.xml
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/tests/TextUI/dataprovider-issue-2922.phpt b/tests/end-to-end/dataprovider-issue-2922.phpt
similarity index 87%
rename from tests/TextUI/dataprovider-issue-2922.phpt
rename to tests/end-to-end/dataprovider-issue-2922.phpt
index 2a864fbf6fd..c724b0ac2ef 100644
--- a/tests/TextUI/dataprovider-issue-2922.phpt
+++ b/tests/end-to-end/dataprovider-issue-2922.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --exclude-group=foo ../_files/DataProviderIssue2922
+phpunit --exclude-group=foo ../../_files/DataProviderIssue2922
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dataprovider-log-xml-isolation.phpt b/tests/end-to-end/dataprovider-log-xml-isolation.phpt
similarity index 98%
rename from tests/TextUI/dataprovider-log-xml-isolation.phpt
rename to tests/end-to-end/dataprovider-log-xml-isolation.phpt
index a1a49769ab0..5fbd3a88d56 100644
--- a/tests/TextUI/dataprovider-log-xml-isolation.phpt
+++ b/tests/end-to-end/dataprovider-log-xml-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+phpunit --process-isolation --log-junit php://stdout DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dataprovider-log-xml.phpt b/tests/end-to-end/dataprovider-log-xml.phpt
similarity index 95%
rename from tests/TextUI/dataprovider-log-xml.phpt
rename to tests/end-to-end/dataprovider-log-xml.phpt
index 642236002c9..9b30eacbb67 100644
--- a/tests/TextUI/dataprovider-log-xml.phpt
+++ b/tests/end-to-end/dataprovider-log-xml.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+phpunit --log-junit php://stdout DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dataprovider-testdox.phpt b/tests/end-to-end/dataprovider-testdox.phpt
similarity index 91%
rename from tests/TextUI/dataprovider-testdox.phpt
rename to tests/end-to-end/dataprovider-testdox.phpt
index 6ebf02f87a9..8de7184c890 100644
--- a/tests/TextUI/dataprovider-testdox.phpt
+++ b/tests/end-to-end/dataprovider-testdox.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit DataProviderTestDoxTest ../_files/DataProviderTestDoxTest.php
+phpunit DataProviderTestDoxTest ../../_files/DataProviderTestDoxTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/debug.phpt b/tests/end-to-end/debug.phpt
similarity index 92%
rename from tests/TextUI/debug.phpt
rename to tests/end-to-end/debug.phpt
index 50af3c72f0a..f343edd795c 100644
--- a/tests/TextUI/debug.phpt
+++ b/tests/end-to-end/debug.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --debug BankAccountTest ../_files/BankAccountTest.php
+phpunit --debug BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/default-isolation.phpt b/tests/end-to-end/default-isolation.phpt
similarity index 86%
rename from tests/TextUI/default-isolation.phpt
rename to tests/end-to-end/default-isolation.phpt
index 49084f49ea0..8880540524b 100644
--- a/tests/TextUI/default-isolation.phpt
+++ b/tests/end-to-end/default-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/default.phpt b/tests/end-to-end/default.phpt
similarity index 88%
rename from tests/TextUI/default.phpt
rename to tests/end-to-end/default.phpt
index cf4c9d348d5..01389dc8804 100644
--- a/tests/TextUI/default.phpt
+++ b/tests/end-to-end/default.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php
+phpunit BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/defaulttestsuite-using-testsuite.phpt b/tests/end-to-end/defaulttestsuite-using-testsuite.phpt
similarity index 100%
rename from tests/TextUI/defaulttestsuite-using-testsuite.phpt
rename to tests/end-to-end/defaulttestsuite-using-testsuite.phpt
diff --git a/tests/TextUI/defaulttestsuite.phpt b/tests/end-to-end/defaulttestsuite.phpt
similarity index 100%
rename from tests/TextUI/defaulttestsuite.phpt
rename to tests/end-to-end/defaulttestsuite.phpt
diff --git a/tests/TextUI/defects-first-order-via-cli.phpt b/tests/end-to-end/defects-first-order-via-cli.phpt
similarity index 100%
rename from tests/TextUI/defects-first-order-via-cli.phpt
rename to tests/end-to-end/defects-first-order-via-cli.phpt
diff --git a/tests/TextUI/dependencies-clone.phpt b/tests/end-to-end/dependencies-clone.phpt
similarity index 86%
rename from tests/TextUI/dependencies-clone.phpt
rename to tests/end-to-end/dependencies-clone.phpt
index ed3e862e2ee..f62801bfdbf 100644
--- a/tests/TextUI/dependencies-clone.phpt
+++ b/tests/end-to-end/dependencies-clone.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --verbose ClonedDependencyTest ../_files/ClonedDependencyTest.php
+phpunit --verbose ClonedDependencyTest ../../_files/ClonedDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dependencies-isolation.phpt b/tests/end-to-end/dependencies-isolation.phpt
similarity index 91%
rename from tests/TextUI/dependencies-isolation.phpt
rename to tests/end-to-end/dependencies-isolation.phpt
index 331204e68cc..88c0808b03c 100644
--- a/tests/TextUI/dependencies-isolation.phpt
+++ b/tests/end-to-end/dependencies-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+phpunit --process-isolation --verbose DependencyTestSuite ../../_files/DependencyTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dependencies.phpt b/tests/end-to-end/dependencies.phpt
similarity index 92%
rename from tests/TextUI/dependencies.phpt
rename to tests/end-to-end/dependencies.phpt
index f495cd76a57..8fab9884d24 100644
--- a/tests/TextUI/dependencies.phpt
+++ b/tests/end-to-end/dependencies.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+phpunit --verbose DependencyTestSuite ../../_files/DependencyTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dependencies2-isolation.phpt b/tests/end-to-end/dependencies2-isolation.phpt
similarity index 87%
rename from tests/TextUI/dependencies2-isolation.phpt
rename to tests/end-to-end/dependencies2-isolation.phpt
index 87af237926e..2c7240eb110 100644
--- a/tests/TextUI/dependencies2-isolation.phpt
+++ b/tests/end-to-end/dependencies2-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation StackTest ../_files/StackTest.php
+phpunit --process-isolation StackTest ../../_files/StackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dependencies2.phpt b/tests/end-to-end/dependencies2.phpt
similarity index 90%
rename from tests/TextUI/dependencies2.phpt
rename to tests/end-to-end/dependencies2.phpt
index 92dd403fa63..cbff0f90015 100644
--- a/tests/TextUI/dependencies2.phpt
+++ b/tests/end-to-end/dependencies2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit StackTest ../_files/StackTest.php
+phpunit StackTest ../../_files/StackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dependencies3-isolation.phpt b/tests/end-to-end/dependencies3-isolation.phpt
similarity index 85%
rename from tests/TextUI/dependencies3-isolation.phpt
rename to tests/end-to-end/dependencies3-isolation.phpt
index c6656d7325f..6329a3da534 100644
--- a/tests/TextUI/dependencies3-isolation.phpt
+++ b/tests/end-to-end/dependencies3-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation MultiDependencyTest ../_files/MultiDependencyTest.php
+phpunit --process-isolation MultiDependencyTest ../../_files/MultiDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/dependencies3.phpt b/tests/end-to-end/dependencies3.phpt
similarity index 87%
rename from tests/TextUI/dependencies3.phpt
rename to tests/end-to-end/dependencies3.phpt
index 210815d56e0..0f684149b32 100644
--- a/tests/TextUI/dependencies3.phpt
+++ b/tests/end-to-end/dependencies3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit MultiDependencyTest ../_files/MultiDependencyTest.php
+phpunit MultiDependencyTest ../../_files/MultiDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/disable-code-coverage-ignore.phpt b/tests/end-to-end/disable-code-coverage-ignore.phpt
similarity index 92%
rename from tests/TextUI/disable-code-coverage-ignore.phpt
rename to tests/end-to-end/disable-code-coverage-ignore.phpt
index 391a0453734..bf75260a52f 100644
--- a/tests/TextUI/disable-code-coverage-ignore.phpt
+++ b/tests/end-to-end/disable-code-coverage-ignore.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout --disable-coverage-ignore IgnoreCodeCoverageClassTest tests/_files/IgnoreCodeCoverageClassTest.php --whitelist ../../tests/_files/IgnoreCodeCoverageClass.php
+phpunit --colors=never --coverage-text=php://stdout --disable-coverage-ignore IgnoreCodeCoverageClassTest tests/_files/IgnoreCodeCoverageClassTest.php --whitelist ../../../tests/_files/IgnoreCodeCoverageClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {
diff --git a/tests/TextUI/empty-testcase.phpt b/tests/end-to-end/empty-testcase.phpt
similarity index 90%
rename from tests/TextUI/empty-testcase.phpt
rename to tests/end-to-end/empty-testcase.phpt
index afc100802f2..05a432074e2 100644
--- a/tests/TextUI/empty-testcase.phpt
+++ b/tests/end-to-end/empty-testcase.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit EmptyTestCaseTest ../_files/EmptyTestCaseTest.php
+phpunit EmptyTestCaseTest ../../_files/EmptyTestCaseTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/exception-stack.phpt b/tests/end-to-end/exception-stack.phpt
similarity index 94%
rename from tests/TextUI/exception-stack.phpt
rename to tests/end-to-end/exception-stack.phpt
index ccedd5a5563..601f039b7bb 100644
--- a/tests/TextUI/exception-stack.phpt
+++ b/tests/end-to-end/exception-stack.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit ExceptionStackTest ../_files/ExceptionStackTest.php
+phpunit ExceptionStackTest ../../_files/ExceptionStackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/exclude-group-isolation.phpt b/tests/end-to-end/exclude-group-isolation.phpt
similarity index 92%
rename from tests/TextUI/exclude-group-isolation.phpt
rename to tests/end-to-end/exclude-group-isolation.phpt
index 0f8bb8080f7..e545395215f 100644
--- a/tests/TextUI/exclude-group-isolation.phpt
+++ b/tests/end-to-end/exclude-group-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/exclude-group.phpt b/tests/end-to-end/exclude-group.phpt
similarity index 94%
rename from tests/TextUI/exclude-group.phpt
rename to tests/end-to-end/exclude-group.phpt
index 90667489aad..c7c37545ec9 100644
--- a/tests/TextUI/exclude-group.phpt
+++ b/tests/end-to-end/exclude-group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/execution-order-options-via-config.phpt b/tests/end-to-end/execution-order-options-via-config.phpt
similarity index 100%
rename from tests/TextUI/execution-order-options-via-config.phpt
rename to tests/end-to-end/execution-order-options-via-config.phpt
diff --git a/tests/TextUI/failure-isolation.phpt b/tests/end-to-end/failure-isolation.phpt
similarity index 97%
rename from tests/TextUI/failure-isolation.phpt
rename to tests/end-to-end/failure-isolation.phpt
index c319f60f5d7..415563c87a2 100644
--- a/tests/TextUI/failure-isolation.phpt
+++ b/tests/end-to-end/failure-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation FailureTest ../_files/FailureTest.php
+phpunit --process-isolation FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/failure-reverse-list.phpt b/tests/end-to-end/failure-reverse-list.phpt
similarity index 97%
rename from tests/TextUI/failure-reverse-list.phpt
rename to tests/end-to-end/failure-reverse-list.phpt
index b16b23540b2..8f532bb0a47 100644
--- a/tests/TextUI/failure-reverse-list.phpt
+++ b/tests/end-to-end/failure-reverse-list.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --reverse-list FailureTest ../_files/FailureTest.php
+phpunit --reverse-list FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/failure.phpt b/tests/end-to-end/failure.phpt
similarity index 97%
rename from tests/TextUI/failure.phpt
rename to tests/end-to-end/failure.phpt
index 217af841e5f..a0d4c1665d3 100644
--- a/tests/TextUI/failure.phpt
+++ b/tests/end-to-end/failure.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit FailureTest ../_files/FailureTest.php
+phpunit FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/fatal-isolation.phpt b/tests/end-to-end/fatal-isolation.phpt
similarity index 89%
rename from tests/TextUI/fatal-isolation.phpt
rename to tests/end-to-end/fatal-isolation.phpt
index bfa7340879e..178acccaaed 100644
--- a/tests/TextUI/fatal-isolation.phpt
+++ b/tests/end-to-end/fatal-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit FatalTest --process-isolation ../_files/FatalTest.php
+phpunit FatalTest --process-isolation ../../_files/FatalTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-class-isolation.phpt b/tests/end-to-end/filter-class-isolation.phpt
similarity index 94%
rename from tests/TextUI/filter-class-isolation.phpt
rename to tests/end-to-end/filter-class-isolation.phpt
index 1bc2ba3b0fd..7bf042f5205 100644
--- a/tests/TextUI/filter-class-isolation.phpt
+++ b/tests/end-to-end/filter-class-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --filter BankAccountTest BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-class.phpt b/tests/end-to-end/filter-class.phpt
similarity index 86%
rename from tests/TextUI/filter-class.phpt
rename to tests/end-to-end/filter-class.phpt
index 5477c0b798a..cb1d5f2bff4 100644
--- a/tests/TextUI/filter-class.phpt
+++ b/tests/end-to-end/filter-class.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter BankAccountTest BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
similarity index 91%
rename from tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
index 27fe0098c33..0cd26e7a9e5 100644
--- a/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt b/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
similarity index 93%
rename from tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
rename to tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
index 8984681f3c8..161ba6a47a5 100644
--- a/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-number-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
similarity index 93%
rename from tests/TextUI/filter-dataprovider-by-number-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
index 6f141e65781..fd66786e170 100644
--- a/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-number.phpt b/tests/end-to-end/filter-dataprovider-by-number.phpt
similarity index 85%
rename from tests/TextUI/filter-dataprovider-by-number.phpt
rename to tests/end-to-end/filter-dataprovider-by-number.phpt
index 90a1fb65280..1bcaed841c1 100644
--- a/tests/TextUI/filter-dataprovider-by-number.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-number.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testTrue#3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
similarity index 93%
rename from tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
index bb007c084f7..7aef134226d 100644
--- a/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-only-range.phpt b/tests/end-to-end/filter-dataprovider-by-only-range.phpt
similarity index 85%
rename from tests/TextUI/filter-dataprovider-by-only-range.phpt
rename to tests/end-to-end/filter-dataprovider-by-only-range.phpt
index fa677f0e8f3..f843f5fc6a6 100644
--- a/tests/TextUI/filter-dataprovider-by-only-range.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-range.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter \#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
similarity index 93%
rename from tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
index 04c10e42c3e..f5c05e3485f 100644
--- a/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter @false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-only-regexp.phpt b/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
similarity index 85%
rename from tests/TextUI/filter-dataprovider-by-only-regexp.phpt
rename to tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
index 0fea03b7be9..aefce778076 100644
--- a/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter @false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
similarity index 92%
rename from tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
index 95c344c179e..ee4f902680f 100644
--- a/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-only-string.phpt b/tests/end-to-end/filter-dataprovider-by-only-string.phpt
similarity index 84%
rename from tests/TextUI/filter-dataprovider-by-only-string.phpt
rename to tests/end-to-end/filter-dataprovider-by-only-string.phpt
index 2dac9ecdd99..1fdc959ec52 100644
--- a/tests/TextUI/filter-dataprovider-by-only-string.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-string.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter @false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-range-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
similarity index 92%
rename from tests/TextUI/filter-dataprovider-by-range-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
index 90335cafc1c..49217b80e54 100644
--- a/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-range.phpt b/tests/end-to-end/filter-dataprovider-by-range.phpt
similarity index 85%
rename from tests/TextUI/filter-dataprovider-by-range.phpt
rename to tests/end-to-end/filter-dataprovider-by-range.phpt
index b028a669636..02d9bc65ae5 100644
--- a/tests/TextUI/filter-dataprovider-by-range.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-range.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testTrue#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
similarity index 92%
rename from tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
index 18b933c07b2..114a2017584 100644
--- a/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-regexp.phpt b/tests/end-to-end/filter-dataprovider-by-regexp.phpt
similarity index 84%
rename from tests/TextUI/filter-dataprovider-by-regexp.phpt
rename to tests/end-to-end/filter-dataprovider-by-regexp.phpt
index 006a4600459..b0a7ab9a6a6 100644
--- a/tests/TextUI/filter-dataprovider-by-regexp.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-regexp.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testFalse@false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-string-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
similarity index 91%
rename from tests/TextUI/filter-dataprovider-by-string-isolation.phpt
rename to tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
index e88a17db679..c93096f07c9 100644
--- a/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testFalse@false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-dataprovider-by-string.phpt b/tests/end-to-end/filter-dataprovider-by-string.phpt
similarity index 94%
rename from tests/TextUI/filter-dataprovider-by-string.phpt
rename to tests/end-to-end/filter-dataprovider-by-string.phpt
index 6dc88ddb625..2e9715cfebd 100644
--- a/tests/TextUI/filter-dataprovider-by-string.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-string.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testFalse@false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-method-case-insensitive.phpt b/tests/end-to-end/filter-method-case-insensitive.phpt
similarity index 85%
rename from tests/TextUI/filter-method-case-insensitive.phpt
rename to tests/end-to-end/filter-method-case-insensitive.phpt
index a2151f7c7a1..fe8d0d4a809 100644
--- a/tests/TextUI/filter-method-case-insensitive.phpt
+++ b/tests/end-to-end/filter-method-case-insensitive.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter /balanceIsInitiallyZero/i BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter /balanceIsInitiallyZero/i BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-method-case-sensitive-no-result.phpt b/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
similarity index 83%
rename from tests/TextUI/filter-method-case-sensitive-no-result.phpt
rename to tests/end-to-end/filter-method-case-sensitive-no-result.phpt
index 4dbfa139915..5b26dbd612e 100644
--- a/tests/TextUI/filter-method-case-sensitive-no-result.phpt
+++ b/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-method-isolation.phpt b/tests/end-to-end/filter-method-isolation.phpt
similarity index 92%
rename from tests/TextUI/filter-method-isolation.phpt
rename to tests/end-to-end/filter-method-isolation.phpt
index 542dff443ab..a324db79f9d 100644
--- a/tests/TextUI/filter-method-isolation.phpt
+++ b/tests/end-to-end/filter-method-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --filter testBalanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-method.phpt b/tests/end-to-end/filter-method.phpt
similarity index 84%
rename from tests/TextUI/filter-method.phpt
rename to tests/end-to-end/filter-method.phpt
index d63101e905e..13bea6da6f1 100644
--- a/tests/TextUI/filter-method.phpt
+++ b/tests/end-to-end/filter-method.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/filter-no-results.phpt b/tests/end-to-end/filter-no-results.phpt
similarity index 84%
rename from tests/TextUI/filter-no-results.phpt
rename to tests/end-to-end/filter-no-results.phpt
index 2999fefaf94..1107a2599ff 100644
--- a/tests/TextUI/filter-no-results.phpt
+++ b/tests/end-to-end/filter-no-results.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter doesNotExist BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter doesNotExist BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/forward-compatibility.phpt b/tests/end-to-end/forward-compatibility.phpt
similarity index 88%
rename from tests/TextUI/forward-compatibility.phpt
rename to tests/end-to-end/forward-compatibility.phpt
index cf4c9d348d5..01389dc8804 100644
--- a/tests/TextUI/forward-compatibility.phpt
+++ b/tests/end-to-end/forward-compatibility.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php
+phpunit BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/group-isolation.phpt b/tests/end-to-end/group-isolation.phpt
similarity index 93%
rename from tests/TextUI/group-isolation.phpt
rename to tests/end-to-end/group-isolation.phpt
index c0ca940bb6b..f6b694fcfd5 100644
--- a/tests/TextUI/group-isolation.phpt
+++ b/tests/end-to-end/group-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/group.phpt b/tests/end-to-end/group.phpt
similarity index 85%
rename from tests/TextUI/group.phpt
rename to tests/end-to-end/group.phpt
index a7f862f2879..0e452a8c708 100644
--- a/tests/TextUI/group.phpt
+++ b/tests/end-to-end/group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/help.phpt b/tests/end-to-end/help.phpt
similarity index 100%
rename from tests/TextUI/help.phpt
rename to tests/end-to-end/help.phpt
diff --git a/tests/TextUI/help2.phpt b/tests/end-to-end/help2.phpt
similarity index 100%
rename from tests/TextUI/help2.phpt
rename to tests/end-to-end/help2.phpt
diff --git a/tests/TextUI/hooks.phpt b/tests/end-to-end/hooks.phpt
similarity index 100%
rename from tests/TextUI/hooks.phpt
rename to tests/end-to-end/hooks.phpt
diff --git a/tests/TextUI/ini-isolation.phpt b/tests/end-to-end/ini-isolation.phpt
similarity index 94%
rename from tests/TextUI/ini-isolation.phpt
rename to tests/end-to-end/ini-isolation.phpt
index 284ecb20401..f1e5fffe59e 100644
--- a/tests/TextUI/ini-isolation.phpt
+++ b/tests/end-to-end/ini-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation -d default_mimetype=application/x-test IniTest ../_files/IniTest.php
+phpunit --process-isolation -d default_mimetype=application/x-test IniTest ../../_files/IniTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/list-groups.phpt b/tests/end-to-end/list-groups.phpt
similarity index 86%
rename from tests/TextUI/list-groups.phpt
rename to tests/end-to-end/list-groups.phpt
index ca97b45338c..c0411e76f8a 100644
--- a/tests/TextUI/list-groups.phpt
+++ b/tests/end-to-end/list-groups.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --list-groups BankAccountTest ../_files/BankAccountTest.php
+phpunit --list-groups BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/list-suites.phpt b/tests/end-to-end/list-suites.phpt
similarity index 100%
rename from tests/TextUI/list-suites.phpt
rename to tests/end-to-end/list-suites.phpt
diff --git a/tests/TextUI/list-tests-dataprovider.phpt b/tests/end-to-end/list-tests-dataprovider.phpt
similarity index 87%
rename from tests/TextUI/list-tests-dataprovider.phpt
rename to tests/end-to-end/list-tests-dataprovider.phpt
index 5474b75cc0b..6a555c03e77 100644
--- a/tests/TextUI/list-tests-dataprovider.phpt
+++ b/tests/end-to-end/list-tests-dataprovider.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --list-tests DataProviderTest ../_files/DataProviderTest.php
+phpunit --list-tests DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/list-tests-xml-dataprovider.phpt b/tests/end-to-end/list-tests-xml-dataprovider.phpt
similarity index 92%
rename from tests/TextUI/list-tests-xml-dataprovider.phpt
rename to tests/end-to-end/list-tests-xml-dataprovider.phpt
index 055dc5cc105..804fda5b5b1 100644
--- a/tests/TextUI/list-tests-xml-dataprovider.phpt
+++ b/tests/end-to-end/list-tests-xml-dataprovider.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --list-tests-xml DataProviderTest ../_files/DataProviderTest.php
+phpunit --list-tests-xml DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $target = tempnam(sys_get_temp_dir(), __FILE__);
diff --git a/tests/TextUI/log-junit.phpt b/tests/end-to-end/log-junit.phpt
similarity index 97%
rename from tests/TextUI/log-junit.phpt
rename to tests/end-to-end/log-junit.phpt
index c37191ed684..42445c2f396 100644
--- a/tests/TextUI/log-junit.phpt
+++ b/tests/end-to-end/log-junit.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --log-junit php://stdout StatusTest ../_files/StatusTest.php
+phpunit --log-junit php://stdout StatusTest ../../_files/StatusTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/log-teamcity.phpt b/tests/end-to-end/log-teamcity.phpt
similarity index 94%
rename from tests/TextUI/log-teamcity.phpt
rename to tests/end-to-end/log-teamcity.phpt
index db919a8843e..cd18d0687ff 100644
--- a/tests/TextUI/log-teamcity.phpt
+++ b/tests/end-to-end/log-teamcity.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --log-teamcity php://stdout BankAccountTest ../_files/BankAccountTest.php
+phpunit --log-teamcity php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/mycommand.phpt b/tests/end-to-end/mycommand.phpt
similarity index 91%
rename from tests/TextUI/mycommand.phpt
rename to tests/end-to-end/mycommand.phpt
index fc63788a3f7..b8df42438fc 100644
--- a/tests/TextUI/mycommand.phpt
+++ b/tests/end-to-end/mycommand.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php
+phpunit BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/options-after-arguments.phpt b/tests/end-to-end/options-after-arguments.phpt
similarity index 87%
rename from tests/TextUI/options-after-arguments.phpt
rename to tests/end-to-end/options-after-arguments.phpt
index dabd8e42ed0..43fd5ecf58e 100644
--- a/tests/TextUI/options-after-arguments.phpt
+++ b/tests/end-to-end/options-after-arguments.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php --colors
+phpunit BankAccountTest ../../_files/BankAccountTest.php --colors
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/order-by-default-invalid-via-cli.phpt b/tests/end-to-end/order-by-default-invalid-via-cli.phpt
similarity index 100%
rename from tests/TextUI/order-by-default-invalid-via-cli.phpt
rename to tests/end-to-end/order-by-default-invalid-via-cli.phpt
diff --git a/tests/TextUI/output-isolation.phpt b/tests/end-to-end/output-isolation.phpt
similarity index 93%
rename from tests/TextUI/output-isolation.phpt
rename to tests/end-to-end/output-isolation.phpt
index 15a87db05b2..424f5d0f95c 100644
--- a/tests/TextUI/output-isolation.phpt
+++ b/tests/end-to-end/output-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testExpectOutputStringFooActualFoo ../_files/OutputTestCase.php
+phpunit --process-isolation --filter testExpectOutputStringFooActualFoo ../../_files/OutputTestCase.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/phar-extension-suppressed.phpt b/tests/end-to-end/phar-extension-suppressed.phpt
similarity index 100%
rename from tests/TextUI/phar-extension-suppressed.phpt
rename to tests/end-to-end/phar-extension-suppressed.phpt
diff --git a/tests/TextUI/phar-extension.phpt b/tests/end-to-end/phar-extension.phpt
similarity index 100%
rename from tests/TextUI/phar-extension.phpt
rename to tests/end-to-end/phar-extension.phpt
diff --git a/tests/TextUI/phpt-args.phpt b/tests/end-to-end/phpt-args.phpt
similarity index 100%
rename from tests/TextUI/phpt-args.phpt
rename to tests/end-to-end/phpt-args.phpt
diff --git a/tests/TextUI/phpt-env.phpt b/tests/end-to-end/phpt-env.phpt
similarity index 100%
rename from tests/TextUI/phpt-env.phpt
rename to tests/end-to-end/phpt-env.phpt
diff --git a/tests/TextUI/phpt-external.phpt b/tests/end-to-end/phpt-external.phpt
similarity index 100%
rename from tests/TextUI/phpt-external.phpt
rename to tests/end-to-end/phpt-external.phpt
diff --git a/tests/TextUI/phpt-stderr.phpt b/tests/end-to-end/phpt-stderr.phpt
similarity index 100%
rename from tests/TextUI/phpt-stderr.phpt
rename to tests/end-to-end/phpt-stderr.phpt
diff --git a/tests/TextUI/phpt-stdin.phpt b/tests/end-to-end/phpt-stdin.phpt
similarity index 100%
rename from tests/TextUI/phpt-stdin.phpt
rename to tests/end-to-end/phpt-stdin.phpt
diff --git a/tests/TextUI/phpt-xfail.phpt b/tests/end-to-end/phpt-xfail.phpt
similarity index 100%
rename from tests/TextUI/phpt-xfail.phpt
rename to tests/end-to-end/phpt-xfail.phpt
diff --git a/tests/Regression/GitHub/1149.phpt b/tests/end-to-end/regression/GitHub/1149.phpt
similarity index 91%
rename from tests/Regression/GitHub/1149.phpt
rename to tests/end-to-end/regression/GitHub/1149.phpt
index bd4b60a5d21..5846e750816 100644
--- a/tests/Regression/GitHub/1149.phpt
+++ b/tests/end-to-end/regression/GitHub/1149.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1149Test';
 $_SERVER['argv'][3] = __DIR__ . '/1149/Issue1149Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/1149/Issue1149Test.php b/tests/end-to-end/regression/GitHub/1149/Issue1149Test.php
similarity index 100%
rename from tests/Regression/GitHub/1149/Issue1149Test.php
rename to tests/end-to-end/regression/GitHub/1149/Issue1149Test.php
diff --git a/tests/Regression/GitHub/1216.phpt b/tests/end-to-end/regression/GitHub/1216.phpt
similarity index 93%
rename from tests/Regression/GitHub/1216.phpt
rename to tests/end-to-end/regression/GitHub/1216.phpt
index 932ad0d3f09..89796bf811b 100644
--- a/tests/Regression/GitHub/1216.phpt
+++ b/tests/end-to-end/regression/GitHub/1216.phpt
@@ -10,7 +10,7 @@ $_SERVER['argv'][4] = '--bootstrap';
 $_SERVER['argv'][5] = __DIR__ . '/1216/bootstrap1216.php';
 $_SERVER['argv'][6] = __DIR__ . '/1216/Issue1216Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/1216/Issue1216Test.php b/tests/end-to-end/regression/GitHub/1216/Issue1216Test.php
similarity index 100%
rename from tests/Regression/GitHub/1216/Issue1216Test.php
rename to tests/end-to-end/regression/GitHub/1216/Issue1216Test.php
diff --git a/tests/Regression/GitHub/1216/bootstrap1216.php b/tests/end-to-end/regression/GitHub/1216/bootstrap1216.php
similarity index 100%
rename from tests/Regression/GitHub/1216/bootstrap1216.php
rename to tests/end-to-end/regression/GitHub/1216/bootstrap1216.php
diff --git a/tests/Regression/GitHub/1216/phpunit1216.xml b/tests/end-to-end/regression/GitHub/1216/phpunit1216.xml
similarity index 100%
rename from tests/Regression/GitHub/1216/phpunit1216.xml
rename to tests/end-to-end/regression/GitHub/1216/phpunit1216.xml
diff --git a/tests/Regression/GitHub/1265.phpt b/tests/end-to-end/regression/GitHub/1265.phpt
similarity index 92%
rename from tests/Regression/GitHub/1265.phpt
rename to tests/end-to-end/regression/GitHub/1265.phpt
index ed66d8094cb..6964f5d88ba 100644
--- a/tests/Regression/GitHub/1265.phpt
+++ b/tests/end-to-end/regression/GitHub/1265.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = __DIR__ . '/1265/phpunit1265.xml';
 $_SERVER['argv'][3] = 'Issue1265Test';
 $_SERVER['argv'][4] = __DIR__ . '/1265/Issue1265Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/1265/Issue1265Test.php b/tests/end-to-end/regression/GitHub/1265/Issue1265Test.php
similarity index 100%
rename from tests/Regression/GitHub/1265/Issue1265Test.php
rename to tests/end-to-end/regression/GitHub/1265/Issue1265Test.php
diff --git a/tests/Regression/GitHub/1265/phpunit1265.xml b/tests/end-to-end/regression/GitHub/1265/phpunit1265.xml
similarity index 100%
rename from tests/Regression/GitHub/1265/phpunit1265.xml
rename to tests/end-to-end/regression/GitHub/1265/phpunit1265.xml
diff --git a/tests/Regression/GitHub/1330.phpt b/tests/end-to-end/regression/GitHub/1330.phpt
similarity index 92%
rename from tests/Regression/GitHub/1330.phpt
rename to tests/end-to-end/regression/GitHub/1330.phpt
index ecc1bce8e4f..898f7a35b29 100644
--- a/tests/Regression/GitHub/1330.phpt
+++ b/tests/end-to-end/regression/GitHub/1330.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][3] = __DIR__ . '/1330/phpunit1330.xml';
 $_SERVER['argv'][4] = 'Issue1330Test';
 $_SERVER['argv'][5] = __DIR__ . '/1330/Issue1330Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/1330/Issue1330Test.php b/tests/end-to-end/regression/GitHub/1330/Issue1330Test.php
similarity index 100%
rename from tests/Regression/GitHub/1330/Issue1330Test.php
rename to tests/end-to-end/regression/GitHub/1330/Issue1330Test.php
diff --git a/tests/Regression/GitHub/1330/phpunit1330.xml b/tests/end-to-end/regression/GitHub/1330/phpunit1330.xml
similarity index 100%
rename from tests/Regression/GitHub/1330/phpunit1330.xml
rename to tests/end-to-end/regression/GitHub/1330/phpunit1330.xml
diff --git a/tests/Regression/GitHub/1335.phpt b/tests/end-to-end/regression/GitHub/1335.phpt
similarity index 91%
rename from tests/Regression/GitHub/1335.phpt
rename to tests/end-to-end/regression/GitHub/1335.phpt
index afb94f9bf42..15045507cab 100644
--- a/tests/Regression/GitHub/1335.phpt
+++ b/tests/end-to-end/regression/GitHub/1335.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/1335/bootstrap1335.php';
 $_SERVER['argv'][4] = __DIR__ . '/1335/Issue1335Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1335/Issue1335Test.php b/tests/end-to-end/regression/GitHub/1335/Issue1335Test.php
similarity index 100%
rename from tests/Regression/GitHub/1335/Issue1335Test.php
rename to tests/end-to-end/regression/GitHub/1335/Issue1335Test.php
diff --git a/tests/Regression/GitHub/1335/bootstrap1335.php b/tests/end-to-end/regression/GitHub/1335/bootstrap1335.php
similarity index 100%
rename from tests/Regression/GitHub/1335/bootstrap1335.php
rename to tests/end-to-end/regression/GitHub/1335/bootstrap1335.php
diff --git a/tests/Regression/GitHub/1337.phpt b/tests/end-to-end/regression/GitHub/1337.phpt
similarity index 91%
rename from tests/Regression/GitHub/1337.phpt
rename to tests/end-to-end/regression/GitHub/1337.phpt
index c9b1512ee89..4bef341b25a 100644
--- a/tests/Regression/GitHub/1337.phpt
+++ b/tests/end-to-end/regression/GitHub/1337.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue1337Test';
 $_SERVER['argv'][4] = __DIR__ . '/1337/Issue1337Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1337/Issue1337Test.php b/tests/end-to-end/regression/GitHub/1337/Issue1337Test.php
similarity index 100%
rename from tests/Regression/GitHub/1337/Issue1337Test.php
rename to tests/end-to-end/regression/GitHub/1337/Issue1337Test.php
diff --git a/tests/Regression/GitHub/1348.phpt b/tests/end-to-end/regression/GitHub/1348.phpt
similarity index 94%
rename from tests/Regression/GitHub/1348.phpt
rename to tests/end-to-end/regression/GitHub/1348.phpt
index f49d9da7271..1d8b2a3dc33 100644
--- a/tests/Regression/GitHub/1348.phpt
+++ b/tests/end-to-end/regression/GitHub/1348.phpt
@@ -13,7 +13,7 @@ $_SERVER['argv'][]  = '--process-isolation';
 $_SERVER['argv'][]  = 'Issue1348Test';
 $_SERVER['argv'][]  = __DIR__ . '/1348/Issue1348Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1348/Issue1348Test.php b/tests/end-to-end/regression/GitHub/1348/Issue1348Test.php
similarity index 100%
rename from tests/Regression/GitHub/1348/Issue1348Test.php
rename to tests/end-to-end/regression/GitHub/1348/Issue1348Test.php
diff --git a/tests/Regression/GitHub/1351.phpt b/tests/end-to-end/regression/GitHub/1351.phpt
similarity index 95%
rename from tests/Regression/GitHub/1351.phpt
rename to tests/end-to-end/regression/GitHub/1351.phpt
index 71dd26b3ab8..66859043b6b 100644
--- a/tests/Regression/GitHub/1351.phpt
+++ b/tests/end-to-end/regression/GitHub/1351.phpt
@@ -13,7 +13,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue1351Test';
 $_SERVER['argv'][4] = __DIR__ . '/1351/Issue1351Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1351/ChildProcessClass1351.php b/tests/end-to-end/regression/GitHub/1351/ChildProcessClass1351.php
similarity index 100%
rename from tests/Regression/GitHub/1351/ChildProcessClass1351.php
rename to tests/end-to-end/regression/GitHub/1351/ChildProcessClass1351.php
diff --git a/tests/Regression/GitHub/1351/Issue1351Test.php b/tests/end-to-end/regression/GitHub/1351/Issue1351Test.php
similarity index 100%
rename from tests/Regression/GitHub/1351/Issue1351Test.php
rename to tests/end-to-end/regression/GitHub/1351/Issue1351Test.php
diff --git a/tests/Regression/GitHub/1374.phpt b/tests/end-to-end/regression/GitHub/1374.phpt
similarity index 91%
rename from tests/Regression/GitHub/1374.phpt
rename to tests/end-to-end/regression/GitHub/1374.phpt
index 3f7c80e51eb..73751e18bc0 100644
--- a/tests/Regression/GitHub/1374.phpt
+++ b/tests/end-to-end/regression/GitHub/1374.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1374Test';
 $_SERVER['argv'][3] = __DIR__ . '/1374/Issue1374Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1374/Issue1374Test.php b/tests/end-to-end/regression/GitHub/1374/Issue1374Test.php
similarity index 100%
rename from tests/Regression/GitHub/1374/Issue1374Test.php
rename to tests/end-to-end/regression/GitHub/1374/Issue1374Test.php
diff --git a/tests/Regression/GitHub/1437.phpt b/tests/end-to-end/regression/GitHub/1437.phpt
similarity index 92%
rename from tests/Regression/GitHub/1437.phpt
rename to tests/end-to-end/regression/GitHub/1437.phpt
index de7077ef275..b107cd0a336 100644
--- a/tests/Regression/GitHub/1437.phpt
+++ b/tests/end-to-end/regression/GitHub/1437.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1437Test';
 $_SERVER['argv'][3] = __DIR__ . '/1437/Issue1437Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1437/Issue1437Test.php b/tests/end-to-end/regression/GitHub/1437/Issue1437Test.php
similarity index 100%
rename from tests/Regression/GitHub/1437/Issue1437Test.php
rename to tests/end-to-end/regression/GitHub/1437/Issue1437Test.php
diff --git a/tests/Regression/GitHub/1468.phpt b/tests/end-to-end/regression/GitHub/1468.phpt
similarity index 92%
rename from tests/Regression/GitHub/1468.phpt
rename to tests/end-to-end/regression/GitHub/1468.phpt
index 73c9d73bdf9..16e3834886a 100644
--- a/tests/Regression/GitHub/1468.phpt
+++ b/tests/end-to-end/regression/GitHub/1468.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--disallow-todo-tests';
 $_SERVER['argv'][3] = 'Issue1468Test';
 $_SERVER['argv'][4] = __DIR__ . '/1468/Issue1468Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1468/Issue1468Test.php b/tests/end-to-end/regression/GitHub/1468/Issue1468Test.php
similarity index 100%
rename from tests/Regression/GitHub/1468/Issue1468Test.php
rename to tests/end-to-end/regression/GitHub/1468/Issue1468Test.php
diff --git a/tests/Regression/GitHub/1471.phpt b/tests/end-to-end/regression/GitHub/1471.phpt
similarity index 92%
rename from tests/Regression/GitHub/1471.phpt
rename to tests/end-to-end/regression/GitHub/1471.phpt
index ee3d6752281..b3263612ea1 100644
--- a/tests/Regression/GitHub/1471.phpt
+++ b/tests/end-to-end/regression/GitHub/1471.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1471Test';
 $_SERVER['argv'][3] = __DIR__ . '/1471/Issue1471Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1471/Issue1471Test.php b/tests/end-to-end/regression/GitHub/1471/Issue1471Test.php
similarity index 100%
rename from tests/Regression/GitHub/1471/Issue1471Test.php
rename to tests/end-to-end/regression/GitHub/1471/Issue1471Test.php
diff --git a/tests/Regression/GitHub/1472.phpt b/tests/end-to-end/regression/GitHub/1472.phpt
similarity index 90%
rename from tests/Regression/GitHub/1472.phpt
rename to tests/end-to-end/regression/GitHub/1472.phpt
index a255176f115..e243bf7e8f4 100644
--- a/tests/Regression/GitHub/1472.phpt
+++ b/tests/end-to-end/regression/GitHub/1472.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1472Test';
 $_SERVER['argv'][3] = __DIR__ . '/1472/Issue1472Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1472/Issue1472Test.php b/tests/end-to-end/regression/GitHub/1472/Issue1472Test.php
similarity index 100%
rename from tests/Regression/GitHub/1472/Issue1472Test.php
rename to tests/end-to-end/regression/GitHub/1472/Issue1472Test.php
diff --git a/tests/Regression/GitHub/1570.phpt b/tests/end-to-end/regression/GitHub/1570.phpt
similarity index 93%
rename from tests/Regression/GitHub/1570.phpt
rename to tests/end-to-end/regression/GitHub/1570.phpt
index 7e30de5d9ed..05e6107599b 100644
--- a/tests/Regression/GitHub/1570.phpt
+++ b/tests/end-to-end/regression/GitHub/1570.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--disallow-test-output';
 $_SERVER['argv'][3] = 'Issue1570Test';
 $_SERVER['argv'][4] = __DIR__ . '/1570/Issue1570Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/1570/Issue1570Test.php b/tests/end-to-end/regression/GitHub/1570/Issue1570Test.php
similarity index 100%
rename from tests/Regression/GitHub/1570/Issue1570Test.php
rename to tests/end-to-end/regression/GitHub/1570/Issue1570Test.php
diff --git a/tests/Regression/GitHub/2137-filter.phpt b/tests/end-to-end/regression/GitHub/2137-filter.phpt
similarity index 93%
rename from tests/Regression/GitHub/2137-filter.phpt
rename to tests/end-to-end/regression/GitHub/2137-filter.phpt
index 7ca926523d3..bb79708a3fe 100644
--- a/tests/Regression/GitHub/2137-filter.phpt
+++ b/tests/end-to-end/regression/GitHub/2137-filter.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][3] = __DIR__ . '/2137/Issue2137Test.php';
 $_SERVER['argv'][4] = '--filter';
 $_SERVER['argv'][5] = 'BrandService';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2137-no_filter.phpt b/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
similarity index 94%
rename from tests/Regression/GitHub/2137-no_filter.phpt
rename to tests/end-to-end/regression/GitHub/2137-no_filter.phpt
index d068472ff49..02105e465c6 100644
--- a/tests/Regression/GitHub/2137-no_filter.phpt
+++ b/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2137Test';
 $_SERVER['argv'][3] = __DIR__ . '/2137/Issue2137Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2137/Issue2137Test.php b/tests/end-to-end/regression/GitHub/2137/Issue2137Test.php
similarity index 100%
rename from tests/Regression/GitHub/2137/Issue2137Test.php
rename to tests/end-to-end/regression/GitHub/2137/Issue2137Test.php
diff --git a/tests/Regression/GitHub/2145.phpt b/tests/end-to-end/regression/GitHub/2145.phpt
similarity index 91%
rename from tests/Regression/GitHub/2145.phpt
rename to tests/end-to-end/regression/GitHub/2145.phpt
index f06b88a1e1a..477acce9005 100644
--- a/tests/Regression/GitHub/2145.phpt
+++ b/tests/end-to-end/regression/GitHub/2145.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = 'Issue2145Test';
 $_SERVER['argv'][3] = '--stop-on-error';
 $_SERVER['argv'][4] = __DIR__ . '/2145/Issue2145Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2145/Issue2145Test.php b/tests/end-to-end/regression/GitHub/2145/Issue2145Test.php
similarity index 100%
rename from tests/Regression/GitHub/2145/Issue2145Test.php
rename to tests/end-to-end/regression/GitHub/2145/Issue2145Test.php
diff --git a/tests/Regression/GitHub/2158.phpt b/tests/end-to-end/regression/GitHub/2158.phpt
similarity index 91%
rename from tests/Regression/GitHub/2158.phpt
rename to tests/end-to-end/regression/GitHub/2158.phpt
index 9ce0b4b5f32..daedfef1173 100644
--- a/tests/Regression/GitHub/2158.phpt
+++ b/tests/end-to-end/regression/GitHub/2158.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2158Test';
 $_SERVER['argv'][3] = __DIR__ . '/2158/Issue2158Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2158/Issue2158Test.php b/tests/end-to-end/regression/GitHub/2158/Issue2158Test.php
similarity index 100%
rename from tests/Regression/GitHub/2158/Issue2158Test.php
rename to tests/end-to-end/regression/GitHub/2158/Issue2158Test.php
diff --git a/tests/Regression/GitHub/2158/constant.inc b/tests/end-to-end/regression/GitHub/2158/constant.inc
similarity index 100%
rename from tests/Regression/GitHub/2158/constant.inc
rename to tests/end-to-end/regression/GitHub/2158/constant.inc
diff --git a/tests/Regression/GitHub/2366.phpt b/tests/end-to-end/regression/GitHub/2366.phpt
similarity index 91%
rename from tests/Regression/GitHub/2366.phpt
rename to tests/end-to-end/regression/GitHub/2366.phpt
index c75e212b336..3d8808dd3b1 100644
--- a/tests/Regression/GitHub/2366.phpt
+++ b/tests/end-to-end/regression/GitHub/2366.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2366Test';
 $_SERVER['argv'][3] = __DIR__ . '/2366/Issue2366Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2366/Issue2366Test.php b/tests/end-to-end/regression/GitHub/2366/Issue2366Test.php
similarity index 100%
rename from tests/Regression/GitHub/2366/Issue2366Test.php
rename to tests/end-to-end/regression/GitHub/2366/Issue2366Test.php
diff --git a/tests/Regression/GitHub/2380.phpt b/tests/end-to-end/regression/GitHub/2380.phpt
similarity index 90%
rename from tests/Regression/GitHub/2380.phpt
rename to tests/end-to-end/regression/GitHub/2380.phpt
index 4defaeebf26..1e6ec765a4c 100644
--- a/tests/Regression/GitHub/2380.phpt
+++ b/tests/end-to-end/regression/GitHub/2380.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2380Test';
 $_SERVER['argv'][3] = __DIR__ . '/2380/Issue2380Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2380/Issue2380Test.php b/tests/end-to-end/regression/GitHub/2380/Issue2380Test.php
similarity index 100%
rename from tests/Regression/GitHub/2380/Issue2380Test.php
rename to tests/end-to-end/regression/GitHub/2380/Issue2380Test.php
diff --git a/tests/Regression/GitHub/2382.phpt b/tests/end-to-end/regression/GitHub/2382.phpt
similarity index 90%
rename from tests/Regression/GitHub/2382.phpt
rename to tests/end-to-end/regression/GitHub/2382.phpt
index 969b25e0a3f..706926e76cb 100644
--- a/tests/Regression/GitHub/2382.phpt
+++ b/tests/end-to-end/regression/GitHub/2382.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2382Test';
 $_SERVER['argv'][3] = __DIR__ . '/2382/Issue2382Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2382/Issue2382Test.php b/tests/end-to-end/regression/GitHub/2382/Issue2382Test.php
similarity index 100%
rename from tests/Regression/GitHub/2382/Issue2382Test.php
rename to tests/end-to-end/regression/GitHub/2382/Issue2382Test.php
diff --git a/tests/Regression/GitHub/2435.phpt b/tests/end-to-end/regression/GitHub/2435.phpt
similarity index 90%
rename from tests/Regression/GitHub/2435.phpt
rename to tests/end-to-end/regression/GitHub/2435.phpt
index f4cabef4a63..a80da995f17 100644
--- a/tests/Regression/GitHub/2435.phpt
+++ b/tests/end-to-end/regression/GitHub/2435.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2435Test';
 $_SERVER['argv'][3] = __DIR__ . '/2435/Issue2435Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2435/Issue2435Test.php b/tests/end-to-end/regression/GitHub/2435/Issue2435Test.php
similarity index 100%
rename from tests/Regression/GitHub/2435/Issue2435Test.php
rename to tests/end-to-end/regression/GitHub/2435/Issue2435Test.php
diff --git a/tests/Regression/GitHub/244.phpt b/tests/end-to-end/regression/GitHub/244.phpt
similarity index 95%
rename from tests/Regression/GitHub/244.phpt
rename to tests/end-to-end/regression/GitHub/244.phpt
index 6624e64159f..2b5f2698eee 100644
--- a/tests/Regression/GitHub/244.phpt
+++ b/tests/end-to-end/regression/GitHub/244.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue244Test';
 $_SERVER['argv'][4] = __DIR__ . '/244/Issue244Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/244/Issue244Test.php b/tests/end-to-end/regression/GitHub/244/Issue244Test.php
similarity index 100%
rename from tests/Regression/GitHub/244/Issue244Test.php
rename to tests/end-to-end/regression/GitHub/244/Issue244Test.php
diff --git a/tests/Regression/GitHub/2448-existing-test.phpt b/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
similarity index 91%
rename from tests/Regression/GitHub/2448-existing-test.phpt
rename to tests/end-to-end/regression/GitHub/2448-existing-test.phpt
index 5706a96f3c1..296be157cb1 100644
--- a/tests/Regression/GitHub/2448-existing-test.phpt
+++ b/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = 'Test';
 
 \chdir(__DIR__ . '/2448');
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main(false);
 
 @unlink(__DIR__ . '/2448/.phpunit.result.cache');
diff --git a/tests/Regression/GitHub/2448-not-existing-test.phpt b/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
similarity index 87%
rename from tests/Regression/GitHub/2448-not-existing-test.phpt
rename to tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
index 89b94bbd44c..784453f7c53 100644
--- a/tests/Regression/GitHub/2448-not-existing-test.phpt
+++ b/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
@@ -5,7 +5,7 @@
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Test';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main(false);
 
 @unlink(__DIR__ . '/2448/.phpunit.result.cache');
diff --git a/tests/Regression/GitHub/2448/.gitignore b/tests/end-to-end/regression/GitHub/2448/.gitignore
similarity index 100%
rename from tests/Regression/GitHub/2448/.gitignore
rename to tests/end-to-end/regression/GitHub/2448/.gitignore
diff --git a/tests/Regression/GitHub/2448/Test.php b/tests/end-to-end/regression/GitHub/2448/Test.php
similarity index 100%
rename from tests/Regression/GitHub/2448/Test.php
rename to tests/end-to-end/regression/GitHub/2448/Test.php
diff --git a/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt b/tests/end-to-end/regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
similarity index 95%
rename from tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
rename to tests/end-to-end/regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
index 4d0dbdfe6cc..81f5c90a175 100644
--- a/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
+++ b/tests/end-to-end/regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrapNoGlobal.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateClassPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/2591-separate-class-preserve.phpt b/tests/end-to-end/regression/GitHub/2591-separate-class-preserve.phpt
similarity index 93%
rename from tests/Regression/GitHub/2591-separate-class-preserve.phpt
rename to tests/end-to-end/regression/GitHub/2591-separate-class-preserve.phpt
index 9594b7f01c9..f8161dd45e5 100644
--- a/tests/Regression/GitHub/2591-separate-class-preserve.phpt
+++ b/tests/end-to-end/regression/GitHub/2591-separate-class-preserve.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateClassPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt
similarity index 100%
rename from tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt
rename to tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-php73.phpt
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
similarity index 96%
rename from tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
rename to tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
index 21e65dd07c9..0003ff25626 100644
--- a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
+++ b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
@@ -14,7 +14,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapNoBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionNoPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
similarity index 96%
rename from tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
rename to tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
index b82f22466a0..0f8e931818d 100644
--- a/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
+++ b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
@@ -16,7 +16,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapNoBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionNoPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve.phpt
similarity index 92%
rename from tests/Regression/GitHub/2591-separate-function-no-preserve.phpt
rename to tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve.phpt
index 44aee685233..639992b4721 100644
--- a/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt
+++ b/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionNoPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/2591-separate-function-preserve.phpt b/tests/end-to-end/regression/GitHub/2591-separate-function-preserve.phpt
similarity index 92%
rename from tests/Regression/GitHub/2591-separate-function-preserve.phpt
rename to tests/end-to-end/regression/GitHub/2591-separate-function-preserve.phpt
index 8bc9c504633..e086149acd6 100644
--- a/tests/Regression/GitHub/2591-separate-function-preserve.phpt
+++ b/tests/end-to-end/regression/GitHub/2591-separate-function-preserve.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php b/tests/end-to-end/regression/GitHub/2591/SeparateClassPreserveTest.php
similarity index 100%
rename from tests/Regression/GitHub/2591/SeparateClassPreserveTest.php
rename to tests/end-to-end/regression/GitHub/2591/SeparateClassPreserveTest.php
diff --git a/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php b/tests/end-to-end/regression/GitHub/2591/SeparateFunctionNoPreserveTest.php
similarity index 100%
rename from tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php
rename to tests/end-to-end/regression/GitHub/2591/SeparateFunctionNoPreserveTest.php
diff --git a/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php b/tests/end-to-end/regression/GitHub/2591/SeparateFunctionPreserveTest.php
similarity index 100%
rename from tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php
rename to tests/end-to-end/regression/GitHub/2591/SeparateFunctionPreserveTest.php
diff --git a/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php b/tests/end-to-end/regression/GitHub/2591/bootstrapNoBootstrap.php
similarity index 86%
rename from tests/Regression/GitHub/2591/bootstrapNoBootstrap.php
rename to tests/end-to-end/regression/GitHub/2591/bootstrapNoBootstrap.php
index bc1e307ac00..f3a8fc0f3ee 100644
--- a/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php
+++ b/tests/end-to-end/regression/GitHub/2591/bootstrapNoBootstrap.php
@@ -12,4 +12,4 @@
 
 $globalString                          = 'Hello';
 
-// require __DIR__ . '/../../../bootstrap.php';
+// require __DIR__ . '/../../../../bootstrap.php';
diff --git a/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php b/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrap.php
similarity index 85%
rename from tests/Regression/GitHub/2591/bootstrapWithBootstrap.php
rename to tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrap.php
index 75426911b14..3d15e46d04d 100644
--- a/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php
+++ b/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrap.php
@@ -9,4 +9,4 @@
  */
 $globalString                          = 'Hello';
 
-require __DIR__ . '/../../../bootstrap.php';
+require __DIR__ . '/../../../../bootstrap.php';
diff --git a/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php b/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
similarity index 82%
rename from tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
rename to tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
index 66c08c4314d..d431f4d4e67 100644
--- a/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
+++ b/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
@@ -8,4 +8,4 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__ . '/../../../bootstrap.php';
+require __DIR__ . '/../../../../bootstrap.php';
diff --git a/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt b/tests/end-to-end/regression/GitHub/2724-diff-pid-from-master-process.phpt
similarity index 93%
rename from tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt
rename to tests/end-to-end/regression/GitHub/2724-diff-pid-from-master-process.phpt
index e05078659dc..4522e3dd8ce 100644
--- a/tests/Regression/GitHub/2724-diff-pid-from-master-process.phpt
+++ b/tests/end-to-end/regression/GitHub/2724-diff-pid-from-master-process.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'SeparateClassRunMethodInNewProcessTest';
 $_SERVER['argv'][3] = __DIR__ . '/2724/SeparateClassRunMethodInNewProcessTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 
 \file_put_contents(__DIR__ . '/2724/parent_process_id.txt', \getmypid());
 
diff --git a/tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php b/tests/end-to-end/regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php
similarity index 100%
rename from tests/Regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php
rename to tests/end-to-end/regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php
diff --git a/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt b/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
similarity index 91%
rename from tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt
rename to tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
index 0985903d4a6..28fcee83b5b 100644
--- a/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt
+++ b/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
@@ -6,7 +6,7 @@ GH-2725: Verify that @runClassInSeparateProcess runs @beforeclass and @afterclas
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = __DIR__ . '/2725/BeforeAfterClassPidTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php b/tests/end-to-end/regression/GitHub/2725/BeforeAfterClassPidTest.php
similarity index 100%
rename from tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php
rename to tests/end-to-end/regression/GitHub/2725/BeforeAfterClassPidTest.php
diff --git a/tests/Regression/GitHub/2731.phpt b/tests/end-to-end/regression/GitHub/2731.phpt
similarity index 92%
rename from tests/Regression/GitHub/2731.phpt
rename to tests/end-to-end/regression/GitHub/2731.phpt
index 681d3c28d8b..1b5e130f57e 100644
--- a/tests/Regression/GitHub/2731.phpt
+++ b/tests/end-to-end/regression/GitHub/2731.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2731Test';
 $_SERVER['argv'][3] = __DIR__ . '/2731/Issue2731Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 ?>
diff --git a/tests/Regression/GitHub/2731/Issue2731Test.php b/tests/end-to-end/regression/GitHub/2731/Issue2731Test.php
similarity index 100%
rename from tests/Regression/GitHub/2731/Issue2731Test.php
rename to tests/end-to-end/regression/GitHub/2731/Issue2731Test.php
diff --git a/tests/Regression/GitHub/2811.phpt b/tests/end-to-end/regression/GitHub/2811.phpt
similarity index 91%
rename from tests/Regression/GitHub/2811.phpt
rename to tests/end-to-end/regression/GitHub/2811.phpt
index 7d442dc212c..bb7afe0f1ca 100644
--- a/tests/Regression/GitHub/2811.phpt
+++ b/tests/end-to-end/regression/GitHub/2811.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2811Test';
 $_SERVER['argv'][3] = __DIR__ . '/2811/Issue2811Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 ?>
diff --git a/tests/Regression/GitHub/2811/Issue2811Test.php b/tests/end-to-end/regression/GitHub/2811/Issue2811Test.php
similarity index 100%
rename from tests/Regression/GitHub/2811/Issue2811Test.php
rename to tests/end-to-end/regression/GitHub/2811/Issue2811Test.php
diff --git a/tests/Regression/GitHub/2830.phpt b/tests/end-to-end/regression/GitHub/2830.phpt
similarity index 91%
rename from tests/Regression/GitHub/2830.phpt
rename to tests/end-to-end/regression/GitHub/2830.phpt
index f46079dae4a..9bee2aa273e 100644
--- a/tests/Regression/GitHub/2830.phpt
+++ b/tests/end-to-end/regression/GitHub/2830.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2830';
 $_SERVER['argv'][3] = __DIR__ . '/2830/Issue2830Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 ?>
diff --git a/tests/Regression/GitHub/2830/Issue2830Test.php b/tests/end-to-end/regression/GitHub/2830/Issue2830Test.php
similarity index 100%
rename from tests/Regression/GitHub/2830/Issue2830Test.php
rename to tests/end-to-end/regression/GitHub/2830/Issue2830Test.php
diff --git a/tests/Regression/GitHub/2972.phpt b/tests/end-to-end/regression/GitHub/2972.phpt
similarity index 90%
rename from tests/Regression/GitHub/2972.phpt
rename to tests/end-to-end/regression/GitHub/2972.phpt
index db9e56963dc..04d15aeea7a 100644
--- a/tests/Regression/GitHub/2972.phpt
+++ b/tests/end-to-end/regression/GitHub/2972.phpt
@@ -5,7 +5,7 @@ GH-2972: Test suite shouldn't fail when it contains both *.phpt files and unconv
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = __DIR__ . '/2972/';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/2972/issue-2972-test.phpt b/tests/end-to-end/regression/GitHub/2972/issue-2972-test.phpt
similarity index 100%
rename from tests/Regression/GitHub/2972/issue-2972-test.phpt
rename to tests/end-to-end/regression/GitHub/2972/issue-2972-test.phpt
diff --git a/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php b/tests/end-to-end/regression/GitHub/2972/unconventiallyNamedIssue2972Test.php
similarity index 100%
rename from tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php
rename to tests/end-to-end/regression/GitHub/2972/unconventiallyNamedIssue2972Test.php
diff --git a/tests/Regression/GitHub/3093/Issue3093Test.php b/tests/end-to-end/regression/GitHub/3093/Issue3093Test.php
similarity index 100%
rename from tests/Regression/GitHub/3093/Issue3093Test.php
rename to tests/end-to-end/regression/GitHub/3093/Issue3093Test.php
diff --git a/tests/Regression/GitHub/3093/issue-3093-test.phpt b/tests/end-to-end/regression/GitHub/3093/issue-3093-test.phpt
similarity index 91%
rename from tests/Regression/GitHub/3093/issue-3093-test.phpt
rename to tests/end-to-end/regression/GitHub/3093/issue-3093-test.phpt
index ffac64da598..f28f5c04a40 100644
--- a/tests/Regression/GitHub/3093/issue-3093-test.phpt
+++ b/tests/end-to-end/regression/GitHub/3093/issue-3093-test.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--reverse-order';
 $_SERVER['argv'][3] = '--resolve-dependencies';
 $_SERVER['argv'][4] = __DIR__ . '/Issue3093Test.php';
 
-require __DIR__ . '/../../../bootstrap.php';
+require __DIR__ . '/../../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/Regression/GitHub/3107/Issue3107Test.php b/tests/end-to-end/regression/GitHub/3107/Issue3107Test.php
similarity index 100%
rename from tests/Regression/GitHub/3107/Issue3107Test.php
rename to tests/end-to-end/regression/GitHub/3107/Issue3107Test.php
diff --git a/tests/Regression/GitHub/3107/issue-3107-test.phpt b/tests/end-to-end/regression/GitHub/3107/issue-3107-test.phpt
similarity index 84%
rename from tests/Regression/GitHub/3107/issue-3107-test.phpt
rename to tests/end-to-end/regression/GitHub/3107/issue-3107-test.phpt
index c5b447485d3..e2314cf4022 100644
--- a/tests/Regression/GitHub/3107/issue-3107-test.phpt
+++ b/tests/end-to-end/regression/GitHub/3107/issue-3107-test.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = '--testdox';
 $_SERVER['argv'][4] = __DIR__ . '/Issue3107Test.php';
 
-require __DIR__ . '/../../../bootstrap.php';
+require __DIR__ . '/../../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
@@ -17,7 +17,7 @@ Issue3107\Issue3107Test
    │
    │ Error: Call to undefined function %Sdoes_not_exist()
    │ 
-   │ %s%etests%eRegression%eGitHub%e3107%eIssue3107Test.php:%d
+   │ %sIssue3107Test.php:%d
    │ 
 
 Time: %s, Memory: %s
diff --git a/tests/Regression/GitHub/3156/Issue3156Test.php b/tests/end-to-end/regression/GitHub/3156/Issue3156Test.php
similarity index 100%
rename from tests/Regression/GitHub/3156/Issue3156Test.php
rename to tests/end-to-end/regression/GitHub/3156/Issue3156Test.php
diff --git a/tests/Regression/GitHub/322.phpt b/tests/end-to-end/regression/GitHub/322.phpt
similarity index 93%
rename from tests/Regression/GitHub/322.phpt
rename to tests/end-to-end/regression/GitHub/322.phpt
index 818d01bbdff..9c76146763c 100644
--- a/tests/Regression/GitHub/322.phpt
+++ b/tests/end-to-end/regression/GitHub/322.phpt
@@ -11,7 +11,7 @@ $_SERVER['argv'][5] = 'one';
 $_SERVER['argv'][6] = 'Issue322Test';
 $_SERVER['argv'][7] = __DIR__ . '/322/Issue322Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/322/Issue322Test.php b/tests/end-to-end/regression/GitHub/322/Issue322Test.php
similarity index 100%
rename from tests/Regression/GitHub/322/Issue322Test.php
rename to tests/end-to-end/regression/GitHub/322/Issue322Test.php
diff --git a/tests/Regression/GitHub/322/phpunit322.xml b/tests/end-to-end/regression/GitHub/322/phpunit322.xml
similarity index 100%
rename from tests/Regression/GitHub/322/phpunit322.xml
rename to tests/end-to-end/regression/GitHub/322/phpunit322.xml
diff --git a/tests/Regression/GitHub/433.phpt b/tests/end-to-end/regression/GitHub/433.phpt
similarity index 93%
rename from tests/Regression/GitHub/433.phpt
rename to tests/end-to-end/regression/GitHub/433.phpt
index f64a29a1833..ffbde4bce04 100644
--- a/tests/Regression/GitHub/433.phpt
+++ b/tests/end-to-end/regression/GitHub/433.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue433Test';
 $_SERVER['argv'][3] = __DIR__ . '/433/Issue433Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/433/Issue433Test.php b/tests/end-to-end/regression/GitHub/433/Issue433Test.php
similarity index 100%
rename from tests/Regression/GitHub/433/Issue433Test.php
rename to tests/end-to-end/regression/GitHub/433/Issue433Test.php
diff --git a/tests/Regression/GitHub/445.phpt b/tests/end-to-end/regression/GitHub/445.phpt
similarity index 93%
rename from tests/Regression/GitHub/445.phpt
rename to tests/end-to-end/regression/GitHub/445.phpt
index a49768c60f4..9ad1b4477bc 100644
--- a/tests/Regression/GitHub/445.phpt
+++ b/tests/end-to-end/regression/GitHub/445.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = '--disallow-test-output';
 $_SERVER['argv'][3] = 'Issue445Test';
 $_SERVER['argv'][4] = __DIR__ . '/445/Issue445Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/445/Issue445Test.php b/tests/end-to-end/regression/GitHub/445/Issue445Test.php
similarity index 100%
rename from tests/Regression/GitHub/445/Issue445Test.php
rename to tests/end-to-end/regression/GitHub/445/Issue445Test.php
diff --git a/tests/Regression/GitHub/498.phpt b/tests/end-to-end/regression/GitHub/498.phpt
similarity index 94%
rename from tests/Regression/GitHub/498.phpt
rename to tests/end-to-end/regression/GitHub/498.phpt
index e231889b2fc..84d70f746f6 100644
--- a/tests/Regression/GitHub/498.phpt
+++ b/tests/end-to-end/regression/GitHub/498.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][3] = 'trueOnly';
 $_SERVER['argv'][4] = 'Issue498Test';
 $_SERVER['argv'][5] = __DIR__ . '/498/Issue498Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/498/Issue498Test.php b/tests/end-to-end/regression/GitHub/498/Issue498Test.php
similarity index 100%
rename from tests/Regression/GitHub/498/Issue498Test.php
rename to tests/end-to-end/regression/GitHub/498/Issue498Test.php
diff --git a/tests/Regression/GitHub/503.phpt b/tests/end-to-end/regression/GitHub/503.phpt
similarity index 93%
rename from tests/Regression/GitHub/503.phpt
rename to tests/end-to-end/regression/GitHub/503.phpt
index 2c8d992dcec..07e93416753 100644
--- a/tests/Regression/GitHub/503.phpt
+++ b/tests/end-to-end/regression/GitHub/503.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue503Test';
 $_SERVER['argv'][3] = __DIR__ . '/503/Issue503Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/503/Issue503Test.php b/tests/end-to-end/regression/GitHub/503/Issue503Test.php
similarity index 100%
rename from tests/Regression/GitHub/503/Issue503Test.php
rename to tests/end-to-end/regression/GitHub/503/Issue503Test.php
diff --git a/tests/Regression/GitHub/581.phpt b/tests/end-to-end/regression/GitHub/581.phpt
similarity index 94%
rename from tests/Regression/GitHub/581.phpt
rename to tests/end-to-end/regression/GitHub/581.phpt
index 861f325ce91..a577c5040b0 100644
--- a/tests/Regression/GitHub/581.phpt
+++ b/tests/end-to-end/regression/GitHub/581.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue581Test';
 $_SERVER['argv'][3] = __DIR__ . '/581/Issue581Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/581/Issue581Test.php b/tests/end-to-end/regression/GitHub/581/Issue581Test.php
similarity index 100%
rename from tests/Regression/GitHub/581/Issue581Test.php
rename to tests/end-to-end/regression/GitHub/581/Issue581Test.php
diff --git a/tests/Regression/GitHub/74.phpt b/tests/end-to-end/regression/GitHub/74.phpt
similarity index 93%
rename from tests/Regression/GitHub/74.phpt
rename to tests/end-to-end/regression/GitHub/74.phpt
index 4f7fa2936f3..920c740f3aa 100644
--- a/tests/Regression/GitHub/74.phpt
+++ b/tests/end-to-end/regression/GitHub/74.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue74Test';
 $_SERVER['argv'][4] = __DIR__ . '/74/Issue74Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/74/Issue74Test.php b/tests/end-to-end/regression/GitHub/74/Issue74Test.php
similarity index 100%
rename from tests/Regression/GitHub/74/Issue74Test.php
rename to tests/end-to-end/regression/GitHub/74/Issue74Test.php
diff --git a/tests/Regression/GitHub/74/NewException.php b/tests/end-to-end/regression/GitHub/74/NewException.php
similarity index 100%
rename from tests/Regression/GitHub/74/NewException.php
rename to tests/end-to-end/regression/GitHub/74/NewException.php
diff --git a/tests/Regression/GitHub/765.phpt b/tests/end-to-end/regression/GitHub/765.phpt
similarity index 93%
rename from tests/Regression/GitHub/765.phpt
rename to tests/end-to-end/regression/GitHub/765.phpt
index 507eff91fab..dc58e7d4d97 100644
--- a/tests/Regression/GitHub/765.phpt
+++ b/tests/end-to-end/regression/GitHub/765.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue765Test';
 $_SERVER['argv'][3] = __DIR__ . '/765/Issue765Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/765/Issue765Test.php b/tests/end-to-end/regression/GitHub/765/Issue765Test.php
similarity index 100%
rename from tests/Regression/GitHub/765/Issue765Test.php
rename to tests/end-to-end/regression/GitHub/765/Issue765Test.php
diff --git a/tests/Regression/GitHub/797.phpt b/tests/end-to-end/regression/GitHub/797.phpt
similarity index 92%
rename from tests/Regression/GitHub/797.phpt
rename to tests/end-to-end/regression/GitHub/797.phpt
index cff94bdd5ba..6ee4430611c 100644
--- a/tests/Regression/GitHub/797.phpt
+++ b/tests/end-to-end/regression/GitHub/797.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][]  = '--bootstrap';
 $_SERVER['argv'][]  = __DIR__ . '/797/bootstrap797.php';
 $_SERVER['argv'][]  = __DIR__ . '/797/Issue797Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/797/Issue797Test.php b/tests/end-to-end/regression/GitHub/797/Issue797Test.php
similarity index 100%
rename from tests/Regression/GitHub/797/Issue797Test.php
rename to tests/end-to-end/regression/GitHub/797/Issue797Test.php
diff --git a/tests/Regression/GitHub/797/bootstrap797.php b/tests/end-to-end/regression/GitHub/797/bootstrap797.php
similarity index 86%
rename from tests/Regression/GitHub/797/bootstrap797.php
rename to tests/end-to-end/regression/GitHub/797/bootstrap797.php
index b51cb8e66bb..90a3eeacc00 100644
--- a/tests/Regression/GitHub/797/bootstrap797.php
+++ b/tests/end-to-end/regression/GitHub/797/bootstrap797.php
@@ -8,6 +8,6 @@
  * file that was distributed with this source code.
  */
 // PHPUnit_Framework_TestCase itself does not exist. :-)
-require __DIR__ . '/../../../bootstrap.php';
+require __DIR__ . '/../../../../bootstrap.php';
 
 const GITHUB_ISSUE = 797;
diff --git a/tests/Regression/GitHub/863.phpt b/tests/end-to-end/regression/GitHub/863.phpt
similarity index 82%
rename from tests/Regression/GitHub/863.phpt
rename to tests/end-to-end/regression/GitHub/863.phpt
index df1c62719bc..465743e38b2 100644
--- a/tests/Regression/GitHub/863.phpt
+++ b/tests/end-to-end/regression/GitHub/863.phpt
@@ -7,9 +7,9 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--repeat';
 $_SERVER['argv'][3] = '50';
 $_SERVER['argv'][4] = 'BankAccountTest';
-$_SERVER['argv'][5] = \dirname(\dirname(__DIR__)) . '/_files/BankAccountTest.php';
+$_SERVER['argv'][5] = \dirname(\dirname(\dirname(__DIR__))) . '/_files/BankAccountTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/873.phpt b/tests/end-to-end/regression/GitHub/873.phpt
similarity index 91%
rename from tests/Regression/GitHub/873.phpt
rename to tests/end-to-end/regression/GitHub/873.phpt
index f0048978471..bd1a6067497 100644
--- a/tests/Regression/GitHub/873.phpt
+++ b/tests/end-to-end/regression/GitHub/873.phpt
@@ -12,7 +12,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue873Test';
 $_SERVER['argv'][3] = __DIR__ . '/873/Issue873Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/GitHub/873/Issue873Test.php b/tests/end-to-end/regression/GitHub/873/Issue873Test.php
similarity index 100%
rename from tests/Regression/GitHub/873/Issue873Test.php
rename to tests/end-to-end/regression/GitHub/873/Issue873Test.php
diff --git a/tests/Regression/Trac/1021.phpt b/tests/end-to-end/regression/Trac/1021.phpt
similarity index 91%
rename from tests/Regression/Trac/1021.phpt
rename to tests/end-to-end/regression/Trac/1021.phpt
index be084675f46..19029b8b21d 100644
--- a/tests/Regression/Trac/1021.phpt
+++ b/tests/end-to-end/regression/Trac/1021.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1021Test';
 $_SERVER['argv'][3] = __DIR__ . '/1021/Issue1021Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/Trac/1021/Issue1021Test.php b/tests/end-to-end/regression/Trac/1021/Issue1021Test.php
similarity index 100%
rename from tests/Regression/Trac/1021/Issue1021Test.php
rename to tests/end-to-end/regression/Trac/1021/Issue1021Test.php
diff --git a/tests/Regression/Trac/523.phpt b/tests/end-to-end/regression/Trac/523.phpt
similarity index 91%
rename from tests/Regression/Trac/523.phpt
rename to tests/end-to-end/regression/Trac/523.phpt
index 6ee85b622b5..84184294529 100644
--- a/tests/Regression/Trac/523.phpt
+++ b/tests/end-to-end/regression/Trac/523.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue523Test';
 $_SERVER['argv'][3] = __DIR__ . '/523/Issue523Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/Trac/523/Issue523Test.php b/tests/end-to-end/regression/Trac/523/Issue523Test.php
similarity index 100%
rename from tests/Regression/Trac/523/Issue523Test.php
rename to tests/end-to-end/regression/Trac/523/Issue523Test.php
diff --git a/tests/Regression/Trac/578.phpt b/tests/end-to-end/regression/Trac/578.phpt
similarity index 94%
rename from tests/Regression/Trac/578.phpt
rename to tests/end-to-end/regression/Trac/578.phpt
index 111e3a011b0..165d53987ee 100644
--- a/tests/Regression/Trac/578.phpt
+++ b/tests/end-to-end/regression/Trac/578.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue578Test';
 $_SERVER['argv'][3] = __DIR__ . '/578/Issue578Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/Trac/578/Issue578Test.php b/tests/end-to-end/regression/Trac/578/Issue578Test.php
similarity index 100%
rename from tests/Regression/Trac/578/Issue578Test.php
rename to tests/end-to-end/regression/Trac/578/Issue578Test.php
diff --git a/tests/Regression/Trac/684.phpt b/tests/end-to-end/regression/Trac/684.phpt
similarity index 92%
rename from tests/Regression/Trac/684.phpt
rename to tests/end-to-end/regression/Trac/684.phpt
index 33eda07c037..ec16889448f 100644
--- a/tests/Regression/Trac/684.phpt
+++ b/tests/end-to-end/regression/Trac/684.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue684Test';
 $_SERVER['argv'][3] = __DIR__ . '/684/Issue684Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/Trac/684/Issue684Test.php b/tests/end-to-end/regression/Trac/684/Issue684Test.php
similarity index 100%
rename from tests/Regression/Trac/684/Issue684Test.php
rename to tests/end-to-end/regression/Trac/684/Issue684Test.php
diff --git a/tests/Regression/Trac/783.phpt b/tests/end-to-end/regression/Trac/783.phpt
similarity index 92%
rename from tests/Regression/Trac/783.phpt
rename to tests/end-to-end/regression/Trac/783.phpt
index b902d36dc89..d1a40b74a19 100644
--- a/tests/Regression/Trac/783.phpt
+++ b/tests/end-to-end/regression/Trac/783.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][3] = 'foo,bar';
 $_SERVER['argv'][4] = 'ParentSuite';
 $_SERVER['argv'][5] = __DIR__ . '/783/ParentSuite.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/tests/Regression/Trac/783/ChildSuite.php b/tests/end-to-end/regression/Trac/783/ChildSuite.php
similarity index 100%
rename from tests/Regression/Trac/783/ChildSuite.php
rename to tests/end-to-end/regression/Trac/783/ChildSuite.php
diff --git a/tests/Regression/Trac/783/OneTest.php b/tests/end-to-end/regression/Trac/783/OneTest.php
similarity index 100%
rename from tests/Regression/Trac/783/OneTest.php
rename to tests/end-to-end/regression/Trac/783/OneTest.php
diff --git a/tests/Regression/Trac/783/ParentSuite.php b/tests/end-to-end/regression/Trac/783/ParentSuite.php
similarity index 100%
rename from tests/Regression/Trac/783/ParentSuite.php
rename to tests/end-to-end/regression/Trac/783/ParentSuite.php
diff --git a/tests/Regression/Trac/783/TwoTest.php b/tests/end-to-end/regression/Trac/783/TwoTest.php
similarity index 100%
rename from tests/Regression/Trac/783/TwoTest.php
rename to tests/end-to-end/regression/Trac/783/TwoTest.php
diff --git a/tests/TextUI/repeat.phpt b/tests/end-to-end/repeat.phpt
similarity index 88%
rename from tests/TextUI/repeat.phpt
rename to tests/end-to-end/repeat.phpt
index ae7eb3f5ae3..6ff980d98e7 100644
--- a/tests/TextUI/repeat.phpt
+++ b/tests/end-to-end/repeat.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --repeat 3 BankAccountTest ../_files/BankAccountTest.php
+phpunit --repeat 3 BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt b/tests/end-to-end/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt
similarity index 100%
rename from tests/TextUI/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt
rename to tests/end-to-end/report-tests-performing-assertions-when-annotated-with-does-not-perform-assertions.phpt
diff --git a/tests/TextUI/report-useless-tests-incomplete.phpt b/tests/end-to-end/report-useless-tests-incomplete.phpt
similarity index 90%
rename from tests/TextUI/report-useless-tests-incomplete.phpt
rename to tests/end-to-end/report-useless-tests-incomplete.phpt
index e00af36e123..320e653079c 100644
--- a/tests/TextUI/report-useless-tests-incomplete.phpt
+++ b/tests/end-to-end/report-useless-tests-incomplete.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit IncompleteTest ../_files/IncompleteTest.php
+phpunit IncompleteTest ../../_files/IncompleteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/report-useless-tests-isolation.phpt b/tests/end-to-end/report-useless-tests-isolation.phpt
similarity index 89%
rename from tests/TextUI/report-useless-tests-isolation.phpt
rename to tests/end-to-end/report-useless-tests-isolation.phpt
index 34d7195017e..6b91bb23cbd 100644
--- a/tests/TextUI/report-useless-tests-isolation.phpt
+++ b/tests/end-to-end/report-useless-tests-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation IncompleteTest ../_files/IncompleteTest.php
+phpunit --process-isolation IncompleteTest ../../_files/IncompleteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/report-useless-tests.phpt b/tests/end-to-end/report-useless-tests.phpt
similarity index 92%
rename from tests/TextUI/report-useless-tests.phpt
rename to tests/end-to-end/report-useless-tests.phpt
index a5c81d2fcef..a3e38df4a1a 100644
--- a/tests/TextUI/report-useless-tests.phpt
+++ b/tests/end-to-end/report-useless-tests.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit NothingTest ../_files/NothingTest.php
+phpunit NothingTest ../../_files/NothingTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/stop-on-defect-via-cli.phpt b/tests/end-to-end/stop-on-defect-via-cli.phpt
similarity index 100%
rename from tests/TextUI/stop-on-defect-via-cli.phpt
rename to tests/end-to-end/stop-on-defect-via-cli.phpt
diff --git a/tests/TextUI/stop-on-defect-via-config.phpt b/tests/end-to-end/stop-on-defect-via-config.phpt
similarity index 100%
rename from tests/TextUI/stop-on-defect-via-config.phpt
rename to tests/end-to-end/stop-on-defect-via-config.phpt
diff --git a/tests/TextUI/stop-on-error-via-cli.phpt b/tests/end-to-end/stop-on-error-via-cli.phpt
similarity index 100%
rename from tests/TextUI/stop-on-error-via-cli.phpt
rename to tests/end-to-end/stop-on-error-via-cli.phpt
diff --git a/tests/TextUI/stop-on-error-via-config.phpt b/tests/end-to-end/stop-on-error-via-config.phpt
similarity index 100%
rename from tests/TextUI/stop-on-error-via-config.phpt
rename to tests/end-to-end/stop-on-error-via-config.phpt
diff --git a/tests/TextUI/stop-on-incomplete-via-cli.phpt b/tests/end-to-end/stop-on-incomplete-via-cli.phpt
similarity index 100%
rename from tests/TextUI/stop-on-incomplete-via-cli.phpt
rename to tests/end-to-end/stop-on-incomplete-via-cli.phpt
diff --git a/tests/TextUI/stop-on-incomplete-via-config.phpt b/tests/end-to-end/stop-on-incomplete-via-config.phpt
similarity index 100%
rename from tests/TextUI/stop-on-incomplete-via-config.phpt
rename to tests/end-to-end/stop-on-incomplete-via-config.phpt
diff --git a/tests/TextUI/stop-on-warning-via-cli.phpt b/tests/end-to-end/stop-on-warning-via-cli.phpt
similarity index 100%
rename from tests/TextUI/stop-on-warning-via-cli.phpt
rename to tests/end-to-end/stop-on-warning-via-cli.phpt
diff --git a/tests/TextUI/stop-on-warning-via-config.phpt b/tests/end-to-end/stop-on-warning-via-config.phpt
similarity index 80%
rename from tests/TextUI/stop-on-warning-via-config.phpt
rename to tests/end-to-end/stop-on-warning-via-config.phpt
index 150b8566f35..84b5633933b 100644
--- a/tests/TextUI/stop-on-warning-via-config.phpt
+++ b/tests/end-to-end/stop-on-warning-via-config.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration_stop_on_warning.xml --stop-on-warning StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
+phpunit -c ../../_files/configuration_stop_on_warning.xml --stop-on-warning StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/tests/TextUI/teamcity-inner-exceptions.phpt b/tests/end-to-end/teamcity-inner-exceptions.phpt
similarity index 96%
rename from tests/TextUI/teamcity-inner-exceptions.phpt
rename to tests/end-to-end/teamcity-inner-exceptions.phpt
index c16f026db5c..ac60ad4db0a 100644
--- a/tests/TextUI/teamcity-inner-exceptions.phpt
+++ b/tests/end-to-end/teamcity-inner-exceptions.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --teamcity ExceptionStackTest ../_files/ExceptionStackTest.php
+phpunit --teamcity ExceptionStackTest ../../_files/ExceptionStackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/teamcity.phpt b/tests/end-to-end/teamcity.phpt
similarity index 95%
rename from tests/TextUI/teamcity.phpt
rename to tests/end-to-end/teamcity.phpt
index bb0f8f49f20..81b0ea77601 100644
--- a/tests/TextUI/teamcity.phpt
+++ b/tests/end-to-end/teamcity.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --teamcity BankAccountTest ../_files/BankAccountTest.php
+phpunit --teamcity BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/test-order-randomized-seed-with-dependency-resolution.phpt b/tests/end-to-end/test-order-randomized-seed-with-dependency-resolution.phpt
similarity index 100%
rename from tests/TextUI/test-order-randomized-seed-with-dependency-resolution.phpt
rename to tests/end-to-end/test-order-randomized-seed-with-dependency-resolution.phpt
diff --git a/tests/TextUI/test-order-randomized-with-dependency-resolution.phpt b/tests/end-to-end/test-order-randomized-with-dependency-resolution.phpt
similarity index 100%
rename from tests/TextUI/test-order-randomized-with-dependency-resolution.phpt
rename to tests/end-to-end/test-order-randomized-with-dependency-resolution.phpt
diff --git a/tests/TextUI/test-order-reversed-with-dependency-resolution.phpt b/tests/end-to-end/test-order-reversed-with-dependency-resolution.phpt
similarity index 100%
rename from tests/TextUI/test-order-reversed-with-dependency-resolution.phpt
rename to tests/end-to-end/test-order-reversed-with-dependency-resolution.phpt
diff --git a/tests/TextUI/test-order-reversed-without-dependency-resolution.phpt b/tests/end-to-end/test-order-reversed-without-dependency-resolution.phpt
similarity index 100%
rename from tests/TextUI/test-order-reversed-without-dependency-resolution.phpt
rename to tests/end-to-end/test-order-reversed-without-dependency-resolution.phpt
diff --git a/tests/TextUI/test-suffix-multiple.phpt b/tests/end-to-end/test-suffix-multiple.phpt
similarity index 89%
rename from tests/TextUI/test-suffix-multiple.phpt
rename to tests/end-to-end/test-suffix-multiple.phpt
index e5184196830..5d6a6b0a857 100644
--- a/tests/TextUI/test-suffix-multiple.phpt
+++ b/tests/end-to-end/test-suffix-multiple.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --test-suffix .test.php,.my.php ../_files/
+phpunit --test-suffix .test.php,.my.php ../../_files/
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/test-suffix-single.phpt b/tests/end-to-end/test-suffix-single.phpt
similarity index 90%
rename from tests/TextUI/test-suffix-single.phpt
rename to tests/end-to-end/test-suffix-single.phpt
index dad2c4dade3..4780864b05f 100644
--- a/tests/TextUI/test-suffix-single.phpt
+++ b/tests/end-to-end/test-suffix-single.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --test-suffix .test.php ../_files/
+phpunit --test-suffix .test.php ../../_files/
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/testdox-dataprovider-placeholder.phpt b/tests/end-to-end/testdox-dataprovider-placeholder.phpt
similarity index 100%
rename from tests/TextUI/testdox-dataprovider-placeholder.phpt
rename to tests/end-to-end/testdox-dataprovider-placeholder.phpt
diff --git a/tests/TextUI/testdox-exclude-group.phpt b/tests/end-to-end/testdox-exclude-group.phpt
similarity index 93%
rename from tests/TextUI/testdox-exclude-group.phpt
rename to tests/end-to-end/testdox-exclude-group.phpt
index af82dfa7934..53c0c5b4aaa 100644
--- a/tests/TextUI/testdox-exclude-group.phpt
+++ b/tests/end-to-end/testdox-exclude-group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-text php://stdout --testdox-exclude-group one TestDoxGroupTest ../_files/TestDoxGroupTest.php
+phpunit --testdox-text php://stdout --testdox-exclude-group one TestDoxGroupTest ../../_files/TestDoxGroupTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/testdox-group.phpt b/tests/end-to-end/testdox-group.phpt
similarity index 94%
rename from tests/TextUI/testdox-group.phpt
rename to tests/end-to-end/testdox-group.phpt
index 3f74d573b24..39bb161a265 100644
--- a/tests/TextUI/testdox-group.phpt
+++ b/tests/end-to-end/testdox-group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-text php://stdout --testdox-group one TestDoxGroupTest ../_files/TestDoxGroupTest.php
+phpunit --testdox-text php://stdout --testdox-group one TestDoxGroupTest ../../_files/TestDoxGroupTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/testdox-html.phpt b/tests/end-to-end/testdox-html.phpt
similarity index 95%
rename from tests/TextUI/testdox-html.phpt
rename to tests/end-to-end/testdox-html.phpt
index 8453712118b..e2753a0a9fb 100644
--- a/tests/TextUI/testdox-html.phpt
+++ b/tests/end-to-end/testdox-html.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-html php://stdout BankAccountTest ../_files/BankAccountTest.php
+phpunit --testdox-html php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/testdox-text.phpt b/tests/end-to-end/testdox-text.phpt
similarity index 88%
rename from tests/TextUI/testdox-text.phpt
rename to tests/end-to-end/testdox-text.phpt
index f6bda8d1daf..b864b70d950 100644
--- a/tests/TextUI/testdox-text.phpt
+++ b/tests/end-to-end/testdox-text.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-text php://stdout BankAccountTest ../_files/BankAccountTest.php
+phpunit --testdox-text php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/testdox-verbose.phpt b/tests/end-to-end/testdox-verbose.phpt
similarity index 100%
rename from tests/TextUI/testdox-verbose.phpt
rename to tests/end-to-end/testdox-verbose.phpt
diff --git a/tests/TextUI/testdox-xml.phpt b/tests/end-to-end/testdox-xml.phpt
similarity index 97%
rename from tests/TextUI/testdox-xml.phpt
rename to tests/end-to-end/testdox-xml.phpt
index dcb2c7e56da..984d0a8d240 100644
--- a/tests/TextUI/testdox-xml.phpt
+++ b/tests/end-to-end/testdox-xml.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-xml php://stdout StatusTest ../_files/StatusTest.php
+phpunit --testdox-xml php://stdout StatusTest ../../_files/StatusTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/TextUI/testdox.phpt b/tests/end-to-end/testdox.phpt
similarity index 86%
rename from tests/TextUI/testdox.phpt
rename to tests/end-to-end/testdox.phpt
index 7812667c948..edb15f42748 100644
--- a/tests/TextUI/testdox.phpt
+++ b/tests/end-to-end/testdox.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox BankAccountTest ../_files/BankAccountTest.php
+phpunit --testdox php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/tests/Fail/fail.phpt b/tests/fail/fail.phpt
similarity index 100%
rename from tests/Fail/fail.phpt
rename to tests/fail/fail.phpt
diff --git a/tests/Framework/AssertTest.php b/tests/unit/Framework/AssertTest.php
similarity index 94%
rename from tests/Framework/AssertTest.php
rename to tests/unit/Framework/AssertTest.php
index b98461c3602..3d7fce2c126 100644
--- a/tests/Framework/AssertTest.php
+++ b/tests/unit/Framework/AssertTest.php
@@ -13,11 +13,6 @@
 
 class AssertTest extends TestCase
 {
-    /**
-     * @var string
-     */
-    private $filesDirectory;
-
     /**
      * @return array<string, string[]>
      */
@@ -29,11 +24,6 @@ public static function validInvalidJsonDataprovider()
         ];
     }
 
-    protected function setUp(): void
-    {
-        $this->filesDirectory = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR;
-    }
-
     public function testFail(): void
     {
         try {
@@ -634,60 +624,60 @@ public function testAssertNotSameFails($a, $b): void
     public function testAssertXmlFileEqualsXmlFile(): void
     {
         $this->assertXmlFileEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlFileEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
     }
 
     public function testAssertXmlFileNotEqualsXmlFile(): void
     {
         $this->assertXmlFileNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlFileNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
     }
 
     public function testAssertXmlStringEqualsXmlFile(): void
     {
         $this->assertXmlStringEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlStringEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
     }
 
     public function testXmlStringNotEqualsXmlFile(): void
     {
         $this->assertXmlStringNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlStringNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
     }
 
@@ -744,10 +734,10 @@ public function testAssertXmlStringNotEqualsXmlString(): void
     public function testXMLStructureIsSame(): void
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureExpected.xml');
+        $actual->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -759,10 +749,10 @@ public function testXMLStructureIsSame(): void
     public function testXMLStructureWrongNumberOfAttributes(): void
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureWrongNumberOfAttributes.xml');
+        $actual->load(TEST_FILES_PATH . 'structureWrongNumberOfAttributes.xml');
 
         $this->expectException(ExpectationFailedException::class);
 
@@ -776,10 +766,10 @@ public function testXMLStructureWrongNumberOfAttributes(): void
     public function testXMLStructureWrongNumberOfNodes(): void
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureWrongNumberOfNodes.xml');
+        $actual->load(TEST_FILES_PATH . 'structureWrongNumberOfNodes.xml');
 
         $this->expectException(ExpectationFailedException::class);
 
@@ -793,10 +783,10 @@ public function testXMLStructureWrongNumberOfNodes(): void
     public function testXMLStructureIsSameButDataIsNot(): void
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureIsSameButDataIsNot.xml');
+        $actual->load(TEST_FILES_PATH . 'structureIsSameButDataIsNot.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -808,10 +798,10 @@ public function testXMLStructureIsSameButDataIsNot(): void
     public function testXMLStructureAttributesAreSameButValuesAreNot(): void
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureAttributesAreSameButValuesAreNot.xml');
+        $actual->load(TEST_FILES_PATH . 'structureAttributesAreSameButValuesAreNot.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -823,10 +813,10 @@ public function testXMLStructureAttributesAreSameButValuesAreNot(): void
     public function testXMLStructureIgnoreTextNodes(): void
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureIgnoreTextNodes.xml');
+        $actual->load(TEST_FILES_PATH . 'structureIgnoreTextNodes.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -1995,60 +1985,60 @@ public function testAssertThatCountOf(): void
     public function testAssertFileEquals(): void
     {
         $this->assertFileEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertFileEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
     }
 
     public function testAssertFileNotEquals(): void
     {
         $this->assertFileNotEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertFileNotEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
     }
 
     public function testAssertStringEqualsFile(): void
     {
         $this->assertStringEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertStringEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
     }
 
     public function testAssertStringNotEqualsFile(): void
     {
         $this->assertStringNotEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertStringNotEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
     }
 
@@ -2360,7 +2350,7 @@ public function testAssertJsonStringNotEqualsJsonStringErrorRaised($expected, $a
 
     public function testAssertJsonStringEqualsJsonFile(): void
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . 'JsonData/simpleObject.json';
         $actual  = \json_encode(['Mascott' => 'Tux']);
         $message = '';
 
@@ -2369,7 +2359,7 @@ public function testAssertJsonStringEqualsJsonFile(): void
 
     public function testAssertJsonStringEqualsJsonFileExpectingExpectationFailedException(): void
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . 'JsonData/simpleObject.json';
         $actual  = \json_encode(['Mascott' => 'Beastie']);
         $message = '';
 
@@ -2389,7 +2379,7 @@ public function testAssertJsonStringEqualsJsonFileExpectingExpectationFailedExce
 
     public function testAssertJsonStringNotEqualsJsonFile(): void
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . 'JsonData/simpleObject.json';
         $actual  = \json_encode(['Mascott' => 'Beastie']);
         $message = '';
 
@@ -2398,8 +2388,8 @@ public function testAssertJsonStringNotEqualsJsonFile(): void
 
     public function testAssertJsonFileNotEqualsJsonFile(): void
     {
-        $fileExpected = __DIR__ . '/../_files/JsonData/simpleObject.json';
-        $fileActual   = __DIR__ . '/../_files/JsonData/arrayObject.json';
+        $fileExpected = TEST_FILES_PATH . 'JsonData/simpleObject.json';
+        $fileActual   = TEST_FILES_PATH . 'JsonData/arrayObject.json';
         $message      = '';
 
         $this->assertJsonFileNotEqualsJsonFile($fileExpected, $fileActual, $message);
@@ -2407,7 +2397,7 @@ public function testAssertJsonFileNotEqualsJsonFile(): void
 
     public function testAssertJsonFileEqualsJsonFile(): void
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . 'JsonData/simpleObject.json';
         $message = '';
 
         $this->assertJsonFileEqualsJsonFile($file, $file, $message);
@@ -2499,11 +2489,11 @@ public function testAssertStringMatchesFormatFileThrowsExceptionForInvalidArgume
 
     public function testAssertStringMatchesFormatFile(): void
     {
-        $this->assertStringMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "FOO\n");
+        $this->assertStringMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "FOO\n");
 
         $this->expectException(AssertionFailedError::class);
 
-        $this->assertStringMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "BAR\n");
+        $this->assertStringMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "BAR\n");
     }
 
     public function testAssertStringNotMatchesFormatFileThrowsExceptionForInvalidArgument(): void
@@ -2515,19 +2505,17 @@ public function testAssertStringNotMatchesFormatFileThrowsExceptionForInvalidArg
 
     public function testAssertStringNotMatchesFormatFile(): void
     {
-        $this->assertStringNotMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "BAR\n");
+        $this->assertStringNotMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "BAR\n");
 
         $this->expectException(AssertionFailedError::class);
 
-        $this->assertStringNotMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "FOO\n");
+        $this->assertStringNotMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "FOO\n");
     }
 
     protected function sameValues()
     {
         $object = new \SampleClass(4, 8, 15);
-        // cannot use $filesDirectory, because neither setUp() nor
-        // setUpBeforeClass() are executed before the data providers
-        $file     = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'foo.xml';
+        $file     = TEST_FILES_PATH . 'foo.xml';
         $resource = \fopen($file, 'r');
 
         return [
@@ -2576,9 +2564,7 @@ protected function notEqualValues()
         $storage2 = new \SplObjectStorage;
         $storage2->attach($object3); // same content, different object
 
-        // cannot use $filesDirectory, because neither setUp() nor
-        // setUpBeforeClass() are executed before the data providers
-        $file = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'foo.xml';
+        $file = TEST_FILES_PATH . 'foo.xml';
 
         return [
             // strings
diff --git a/tests/Framework/Constraint/ArrayHasKeyTest.php b/tests/unit/Framework/Constraint/ArrayHasKeyTest.php
similarity index 100%
rename from tests/Framework/Constraint/ArrayHasKeyTest.php
rename to tests/unit/Framework/Constraint/ArrayHasKeyTest.php
diff --git a/tests/Framework/Constraint/ArraySubsetTest.php b/tests/unit/Framework/Constraint/ArraySubsetTest.php
similarity index 100%
rename from tests/Framework/Constraint/ArraySubsetTest.php
rename to tests/unit/Framework/Constraint/ArraySubsetTest.php
diff --git a/tests/Framework/Constraint/AttributeTest.php b/tests/unit/Framework/Constraint/AttributeTest.php
similarity index 100%
rename from tests/Framework/Constraint/AttributeTest.php
rename to tests/unit/Framework/Constraint/AttributeTest.php
diff --git a/tests/Framework/Constraint/CallbackTest.php b/tests/unit/Framework/Constraint/CallbackTest.php
similarity index 100%
rename from tests/Framework/Constraint/CallbackTest.php
rename to tests/unit/Framework/Constraint/CallbackTest.php
diff --git a/tests/Framework/Constraint/ClassHasAttributeTest.php b/tests/unit/Framework/Constraint/ClassHasAttributeTest.php
similarity index 100%
rename from tests/Framework/Constraint/ClassHasAttributeTest.php
rename to tests/unit/Framework/Constraint/ClassHasAttributeTest.php
diff --git a/tests/Framework/Constraint/ClassHasStaticAttributeTest.php b/tests/unit/Framework/Constraint/ClassHasStaticAttributeTest.php
similarity index 100%
rename from tests/Framework/Constraint/ClassHasStaticAttributeTest.php
rename to tests/unit/Framework/Constraint/ClassHasStaticAttributeTest.php
diff --git a/tests/Framework/Constraint/ConstraintTestCase.php b/tests/unit/Framework/Constraint/ConstraintTestCase.php
similarity index 100%
rename from tests/Framework/Constraint/ConstraintTestCase.php
rename to tests/unit/Framework/Constraint/ConstraintTestCase.php
diff --git a/tests/Framework/Constraint/CountTest.php b/tests/unit/Framework/Constraint/CountTest.php
similarity index 100%
rename from tests/Framework/Constraint/CountTest.php
rename to tests/unit/Framework/Constraint/CountTest.php
diff --git a/tests/Framework/Constraint/DirectoryExistsTest.php b/tests/unit/Framework/Constraint/DirectoryExistsTest.php
similarity index 100%
rename from tests/Framework/Constraint/DirectoryExistsTest.php
rename to tests/unit/Framework/Constraint/DirectoryExistsTest.php
diff --git a/tests/Framework/Constraint/ExceptionMessageRegExpTest.php b/tests/unit/Framework/Constraint/ExceptionMessageRegExpTest.php
similarity index 100%
rename from tests/Framework/Constraint/ExceptionMessageRegExpTest.php
rename to tests/unit/Framework/Constraint/ExceptionMessageRegExpTest.php
diff --git a/tests/Framework/Constraint/ExceptionMessageTest.php b/tests/unit/Framework/Constraint/ExceptionMessageTest.php
similarity index 100%
rename from tests/Framework/Constraint/ExceptionMessageTest.php
rename to tests/unit/Framework/Constraint/ExceptionMessageTest.php
diff --git a/tests/Framework/Constraint/FileExistsTest.php b/tests/unit/Framework/Constraint/FileExistsTest.php
similarity index 100%
rename from tests/Framework/Constraint/FileExistsTest.php
rename to tests/unit/Framework/Constraint/FileExistsTest.php
diff --git a/tests/Framework/Constraint/GreaterThanTest.php b/tests/unit/Framework/Constraint/GreaterThanTest.php
similarity index 100%
rename from tests/Framework/Constraint/GreaterThanTest.php
rename to tests/unit/Framework/Constraint/GreaterThanTest.php
diff --git a/tests/Framework/Constraint/IsEmptyTest.php b/tests/unit/Framework/Constraint/IsEmptyTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsEmptyTest.php
rename to tests/unit/Framework/Constraint/IsEmptyTest.php
diff --git a/tests/Framework/Constraint/IsEqualTest.php b/tests/unit/Framework/Constraint/IsEqualTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsEqualTest.php
rename to tests/unit/Framework/Constraint/IsEqualTest.php
diff --git a/tests/Framework/Constraint/IsIdenticalTest.php b/tests/unit/Framework/Constraint/IsIdenticalTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsIdenticalTest.php
rename to tests/unit/Framework/Constraint/IsIdenticalTest.php
diff --git a/tests/Framework/Constraint/IsInstanceOfTest.php b/tests/unit/Framework/Constraint/IsInstanceOfTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsInstanceOfTest.php
rename to tests/unit/Framework/Constraint/IsInstanceOfTest.php
diff --git a/tests/Framework/Constraint/IsJsonTest.php b/tests/unit/Framework/Constraint/IsJsonTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsJsonTest.php
rename to tests/unit/Framework/Constraint/IsJsonTest.php
diff --git a/tests/Framework/Constraint/IsNullTest.php b/tests/unit/Framework/Constraint/IsNullTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsNullTest.php
rename to tests/unit/Framework/Constraint/IsNullTest.php
diff --git a/tests/Framework/Constraint/IsReadableTest.php b/tests/unit/Framework/Constraint/IsReadableTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsReadableTest.php
rename to tests/unit/Framework/Constraint/IsReadableTest.php
diff --git a/tests/Framework/Constraint/IsTypeTest.php b/tests/unit/Framework/Constraint/IsTypeTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsTypeTest.php
rename to tests/unit/Framework/Constraint/IsTypeTest.php
diff --git a/tests/Framework/Constraint/IsWritableTest.php b/tests/unit/Framework/Constraint/IsWritableTest.php
similarity index 100%
rename from tests/Framework/Constraint/IsWritableTest.php
rename to tests/unit/Framework/Constraint/IsWritableTest.php
diff --git a/tests/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php b/tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
similarity index 100%
rename from tests/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
rename to tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
diff --git a/tests/Framework/Constraint/JsonMatchesTest.php b/tests/unit/Framework/Constraint/JsonMatchesTest.php
similarity index 100%
rename from tests/Framework/Constraint/JsonMatchesTest.php
rename to tests/unit/Framework/Constraint/JsonMatchesTest.php
diff --git a/tests/Framework/Constraint/LessThanTest.php b/tests/unit/Framework/Constraint/LessThanTest.php
similarity index 100%
rename from tests/Framework/Constraint/LessThanTest.php
rename to tests/unit/Framework/Constraint/LessThanTest.php
diff --git a/tests/Framework/Constraint/LogicalAndTest.php b/tests/unit/Framework/Constraint/LogicalAndTest.php
similarity index 100%
rename from tests/Framework/Constraint/LogicalAndTest.php
rename to tests/unit/Framework/Constraint/LogicalAndTest.php
diff --git a/tests/Framework/Constraint/LogicalOrTest.php b/tests/unit/Framework/Constraint/LogicalOrTest.php
similarity index 100%
rename from tests/Framework/Constraint/LogicalOrTest.php
rename to tests/unit/Framework/Constraint/LogicalOrTest.php
diff --git a/tests/Framework/Constraint/LogicalXorTest.php b/tests/unit/Framework/Constraint/LogicalXorTest.php
similarity index 100%
rename from tests/Framework/Constraint/LogicalXorTest.php
rename to tests/unit/Framework/Constraint/LogicalXorTest.php
diff --git a/tests/Framework/Constraint/ObjectHasAttributeTest.php b/tests/unit/Framework/Constraint/ObjectHasAttributeTest.php
similarity index 100%
rename from tests/Framework/Constraint/ObjectHasAttributeTest.php
rename to tests/unit/Framework/Constraint/ObjectHasAttributeTest.php
diff --git a/tests/Framework/Constraint/RegularExpressionTest.php b/tests/unit/Framework/Constraint/RegularExpressionTest.php
similarity index 100%
rename from tests/Framework/Constraint/RegularExpressionTest.php
rename to tests/unit/Framework/Constraint/RegularExpressionTest.php
diff --git a/tests/Framework/Constraint/SameSizeTest.php b/tests/unit/Framework/Constraint/SameSizeTest.php
similarity index 100%
rename from tests/Framework/Constraint/SameSizeTest.php
rename to tests/unit/Framework/Constraint/SameSizeTest.php
diff --git a/tests/Framework/Constraint/StringContainsTest.php b/tests/unit/Framework/Constraint/StringContainsTest.php
similarity index 100%
rename from tests/Framework/Constraint/StringContainsTest.php
rename to tests/unit/Framework/Constraint/StringContainsTest.php
diff --git a/tests/Framework/Constraint/StringEndsWithTest.php b/tests/unit/Framework/Constraint/StringEndsWithTest.php
similarity index 100%
rename from tests/Framework/Constraint/StringEndsWithTest.php
rename to tests/unit/Framework/Constraint/StringEndsWithTest.php
diff --git a/tests/Framework/Constraint/StringMatchesFormatDescriptionTest.php b/tests/unit/Framework/Constraint/StringMatchesFormatDescriptionTest.php
similarity index 100%
rename from tests/Framework/Constraint/StringMatchesFormatDescriptionTest.php
rename to tests/unit/Framework/Constraint/StringMatchesFormatDescriptionTest.php
diff --git a/tests/Framework/Constraint/StringStartsWithTest.php b/tests/unit/Framework/Constraint/StringStartsWithTest.php
similarity index 100%
rename from tests/Framework/Constraint/StringStartsWithTest.php
rename to tests/unit/Framework/Constraint/StringStartsWithTest.php
diff --git a/tests/Framework/Constraint/TraversableContainsTest.php b/tests/unit/Framework/Constraint/TraversableContainsTest.php
similarity index 100%
rename from tests/Framework/Constraint/TraversableContainsTest.php
rename to tests/unit/Framework/Constraint/TraversableContainsTest.php
diff --git a/tests/Framework/ConstraintTest.php b/tests/unit/Framework/ConstraintTest.php
similarity index 99%
rename from tests/Framework/ConstraintTest.php
rename to tests/unit/Framework/ConstraintTest.php
index 4e8bd70c50b..9cd623ec189 100644
--- a/tests/Framework/ConstraintTest.php
+++ b/tests/unit/Framework/ConstraintTest.php
@@ -71,7 +71,7 @@ public function testConstraintArrayNotHasKey2(): void
 
     public function testConstraintFileNotExists(): void
     {
-        $file = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
+        $file = TEST_FILES_PATH . 'ClassWithNonPublicAttributes.php';
 
         $constraint = Assert::logicalNot(
             Assert::fileExists()
@@ -101,7 +101,7 @@ public function testConstraintFileNotExists(): void
 
     public function testConstraintFileNotExists2(): void
     {
-        $file = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
+        $file = TEST_FILES_PATH . 'ClassWithNonPublicAttributes.php';
 
         $constraint = Assert::logicalNot(
             Assert::fileExists()
diff --git a/tests/Framework/ExceptionWrapperTest.php b/tests/unit/Framework/ExceptionWrapperTest.php
similarity index 100%
rename from tests/Framework/ExceptionWrapperTest.php
rename to tests/unit/Framework/ExceptionWrapperTest.php
diff --git a/tests/Framework/MockObject/Builder/InvocationMockerTest.php b/tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php
similarity index 100%
rename from tests/Framework/MockObject/Builder/InvocationMockerTest.php
rename to tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php
diff --git a/tests/Framework/MockObject/Generator/232.phpt b/tests/unit/Framework/MockObject/Generator/232.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/232.phpt
rename to tests/unit/Framework/MockObject/Generator/232.phpt
diff --git a/tests/Framework/MockObject/Generator/3154_namespaced_constant_resolving.phpt b/tests/unit/Framework/MockObject/Generator/3154_namespaced_constant_resolving.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/3154_namespaced_constant_resolving.phpt
rename to tests/unit/Framework/MockObject/Generator/3154_namespaced_constant_resolving.phpt
diff --git a/tests/Framework/MockObject/Generator/397.phpt b/tests/unit/Framework/MockObject/Generator/397.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/397.phpt
rename to tests/unit/Framework/MockObject/Generator/397.phpt
diff --git a/tests/Framework/MockObject/Generator/abstract_class.phpt b/tests/unit/Framework/MockObject/Generator/abstract_class.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/abstract_class.phpt
rename to tests/unit/Framework/MockObject/Generator/abstract_class.phpt
diff --git a/tests/Framework/MockObject/Generator/class.phpt b/tests/unit/Framework/MockObject/Generator/class.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class.phpt
rename to tests/unit/Framework/MockObject/Generator/class.phpt
diff --git a/tests/Framework/MockObject/Generator/class_call_parent_clone.phpt b/tests/unit/Framework/MockObject/Generator/class_call_parent_clone.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_call_parent_clone.phpt
rename to tests/unit/Framework/MockObject/Generator/class_call_parent_clone.phpt
diff --git a/tests/Framework/MockObject/Generator/class_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/class_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/class_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/class_dont_call_parent_clone.phpt b/tests/unit/Framework/MockObject/Generator/class_dont_call_parent_clone.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_dont_call_parent_clone.phpt
rename to tests/unit/Framework/MockObject/Generator/class_dont_call_parent_clone.phpt
diff --git a/tests/Framework/MockObject/Generator/class_dont_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/class_dont_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_dont_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/class_dont_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/class_implementing_interface_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/class_implementing_interface_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_implementing_interface_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/class_implementing_interface_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/class_implementing_interface_dont_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/class_implementing_interface_dont_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_implementing_interface_dont_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/class_implementing_interface_dont_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/class_partial.phpt b/tests/unit/Framework/MockObject/Generator/class_partial.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_partial.phpt
rename to tests/unit/Framework/MockObject/Generator/class_partial.phpt
diff --git a/tests/Framework/MockObject/Generator/class_with_deprecated_method.phpt b/tests/unit/Framework/MockObject/Generator/class_with_deprecated_method.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_with_deprecated_method.phpt
rename to tests/unit/Framework/MockObject/Generator/class_with_deprecated_method.phpt
diff --git a/tests/Framework/MockObject/Generator/class_with_method_named_method.phpt b/tests/unit/Framework/MockObject/Generator/class_with_method_named_method.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_with_method_named_method.phpt
rename to tests/unit/Framework/MockObject/Generator/class_with_method_named_method.phpt
diff --git a/tests/Framework/MockObject/Generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt b/tests/unit/Framework/MockObject/Generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt
rename to tests/unit/Framework/MockObject/Generator/class_with_method_with_nullable_typehinted_variadic_arguments.phpt
diff --git a/tests/Framework/MockObject/Generator/class_with_method_with_typehinted_variadic_arguments.phpt b/tests/unit/Framework/MockObject/Generator/class_with_method_with_typehinted_variadic_arguments.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_with_method_with_typehinted_variadic_arguments.phpt
rename to tests/unit/Framework/MockObject/Generator/class_with_method_with_typehinted_variadic_arguments.phpt
diff --git a/tests/Framework/MockObject/Generator/class_with_method_with_variadic_arguments.phpt b/tests/unit/Framework/MockObject/Generator/class_with_method_with_variadic_arguments.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/class_with_method_with_variadic_arguments.phpt
rename to tests/unit/Framework/MockObject/Generator/class_with_method_with_variadic_arguments.phpt
diff --git a/tests/Framework/MockObject/Generator/constant_as_parameter_default_value.phpt b/tests/unit/Framework/MockObject/Generator/constant_as_parameter_default_value.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/constant_as_parameter_default_value.phpt
rename to tests/unit/Framework/MockObject/Generator/constant_as_parameter_default_value.phpt
diff --git a/tests/Framework/MockObject/Generator/interface.phpt b/tests/unit/Framework/MockObject/Generator/interface.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/interface.phpt
rename to tests/unit/Framework/MockObject/Generator/interface.phpt
diff --git a/tests/Framework/MockObject/Generator/invocation_object_clone_object.phpt b/tests/unit/Framework/MockObject/Generator/invocation_object_clone_object.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/invocation_object_clone_object.phpt
rename to tests/unit/Framework/MockObject/Generator/invocation_object_clone_object.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class_call_parent_clone.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class_call_parent_clone.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class_call_parent_clone.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class_call_parent_clone.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class_dont_call_parent_clone.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class_dont_call_parent_clone.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class_dont_call_parent_clone.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class_dont_call_parent_clone.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class_dont_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class_dont_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class_dont_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class_dont_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class_implementing_interface_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class_implementing_interface_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class_implementing_interface_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class_implementing_interface_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_class_partial.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_class_partial.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_class_partial.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_class_partial.phpt
diff --git a/tests/Framework/MockObject/Generator/namespaced_interface.phpt b/tests/unit/Framework/MockObject/Generator/namespaced_interface.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/namespaced_interface.phpt
rename to tests/unit/Framework/MockObject/Generator/namespaced_interface.phpt
diff --git a/tests/Framework/MockObject/Generator/nonexistent_class.phpt b/tests/unit/Framework/MockObject/Generator/nonexistent_class.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/nonexistent_class.phpt
rename to tests/unit/Framework/MockObject/Generator/nonexistent_class.phpt
diff --git a/tests/Framework/MockObject/Generator/nonexistent_class_with_namespace.phpt b/tests/unit/Framework/MockObject/Generator/nonexistent_class_with_namespace.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/nonexistent_class_with_namespace.phpt
rename to tests/unit/Framework/MockObject/Generator/nonexistent_class_with_namespace.phpt
diff --git a/tests/Framework/MockObject/Generator/nonexistent_class_with_namespace_starting_with_separator.phpt b/tests/unit/Framework/MockObject/Generator/nonexistent_class_with_namespace_starting_with_separator.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/nonexistent_class_with_namespace_starting_with_separator.phpt
rename to tests/unit/Framework/MockObject/Generator/nonexistent_class_with_namespace_starting_with_separator.phpt
diff --git a/tests/Framework/MockObject/Generator/nullable_types.phpt b/tests/unit/Framework/MockObject/Generator/nullable_types.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/nullable_types.phpt
rename to tests/unit/Framework/MockObject/Generator/nullable_types.phpt
diff --git a/tests/Framework/MockObject/Generator/proxy.phpt b/tests/unit/Framework/MockObject/Generator/proxy.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/proxy.phpt
rename to tests/unit/Framework/MockObject/Generator/proxy.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_closure.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_closure.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_closure.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_closure.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_final.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_final.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_final.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_final.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_generator.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_generator.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_generator.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_generator.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_nullable.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_nullable.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_nullable.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_nullable.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_object_method.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_object_method.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_object_method.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_object_method.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_parent.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_parent.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_parent.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_parent.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_self.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_self.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_self.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_self.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_static_method.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_static_method.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_static_method.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_static_method.phpt
diff --git a/tests/Framework/MockObject/Generator/return_type_declarations_void.phpt b/tests/unit/Framework/MockObject/Generator/return_type_declarations_void.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/return_type_declarations_void.phpt
rename to tests/unit/Framework/MockObject/Generator/return_type_declarations_void.phpt
diff --git a/tests/Framework/MockObject/Generator/scalar_type_declarations.phpt b/tests/unit/Framework/MockObject/Generator/scalar_type_declarations.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/scalar_type_declarations.phpt
rename to tests/unit/Framework/MockObject/Generator/scalar_type_declarations.phpt
diff --git a/tests/Framework/MockObject/Generator/wsdl_class.phpt b/tests/unit/Framework/MockObject/Generator/wsdl_class.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/wsdl_class.phpt
rename to tests/unit/Framework/MockObject/Generator/wsdl_class.phpt
diff --git a/tests/Framework/MockObject/Generator/wsdl_class_namespace.phpt b/tests/unit/Framework/MockObject/Generator/wsdl_class_namespace.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/wsdl_class_namespace.phpt
rename to tests/unit/Framework/MockObject/Generator/wsdl_class_namespace.phpt
diff --git a/tests/Framework/MockObject/Generator/wsdl_class_partial.phpt b/tests/unit/Framework/MockObject/Generator/wsdl_class_partial.phpt
similarity index 100%
rename from tests/Framework/MockObject/Generator/wsdl_class_partial.phpt
rename to tests/unit/Framework/MockObject/Generator/wsdl_class_partial.phpt
diff --git a/tests/Framework/MockObject/GeneratorTest.php b/tests/unit/Framework/MockObject/GeneratorTest.php
similarity index 100%
rename from tests/Framework/MockObject/GeneratorTest.php
rename to tests/unit/Framework/MockObject/GeneratorTest.php
diff --git a/tests/Framework/MockObject/Invocation/ObjectInvocationTest.php b/tests/unit/Framework/MockObject/Invocation/ObjectInvocationTest.php
similarity index 100%
rename from tests/Framework/MockObject/Invocation/ObjectInvocationTest.php
rename to tests/unit/Framework/MockObject/Invocation/ObjectInvocationTest.php
diff --git a/tests/Framework/MockObject/Invocation/StaticInvocationTest.php b/tests/unit/Framework/MockObject/Invocation/StaticInvocationTest.php
similarity index 100%
rename from tests/Framework/MockObject/Invocation/StaticInvocationTest.php
rename to tests/unit/Framework/MockObject/Invocation/StaticInvocationTest.php
diff --git a/tests/Framework/MockObject/Matcher/ConsecutiveParametersTest.php b/tests/unit/Framework/MockObject/Matcher/ConsecutiveParametersTest.php
similarity index 100%
rename from tests/Framework/MockObject/Matcher/ConsecutiveParametersTest.php
rename to tests/unit/Framework/MockObject/Matcher/ConsecutiveParametersTest.php
diff --git a/tests/Framework/MockObject/MockBuilderTest.php b/tests/unit/Framework/MockObject/MockBuilderTest.php
similarity index 100%
rename from tests/Framework/MockObject/MockBuilderTest.php
rename to tests/unit/Framework/MockObject/MockBuilderTest.php
diff --git a/tests/Framework/MockObject/MockObjectTest.php b/tests/unit/Framework/MockObject/MockObjectTest.php
similarity index 98%
rename from tests/Framework/MockObject/MockObjectTest.php
rename to tests/unit/Framework/MockObject/MockObjectTest.php
index 02cebb58a15..1b0428252ad 100644
--- a/tests/Framework/MockObject/MockObjectTest.php
+++ b/tests/unit/Framework/MockObject/MockObjectTest.php
@@ -908,7 +908,7 @@ public function testMockArgumentsPassedByReference4(): void
      */
     public function testCreateMockFromWsdl(): void
     {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/../../_files/GoogleSearch.wsdl', 'WsdlMock');
+        $mock = $this->getMockFromWsdl(TEST_FILES_PATH . 'GoogleSearch.wsdl', 'WsdlMock');
 
         $this->assertStringStartsWith(
             'Mock_WsdlMock_',
@@ -921,7 +921,7 @@ public function testCreateMockFromWsdl(): void
      */
     public function testCreateNamespacedMockFromWsdl(): void
     {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/../../_files/GoogleSearch.wsdl', 'My\\Space\\WsdlMock');
+        $mock = $this->getMockFromWsdl(TEST_FILES_PATH . 'GoogleSearch.wsdl', 'My\\Space\\WsdlMock');
 
         $this->assertStringStartsWith(
             'Mock_WsdlMock_',
@@ -934,8 +934,8 @@ public function testCreateNamespacedMockFromWsdl(): void
      */
     public function testCreateTwoMocksOfOneWsdlFile(): void
     {
-        $a = $this->getMockFromWsdl(__DIR__ . '/../../_files/GoogleSearch.wsdl');
-        $b = $this->getMockFromWsdl(__DIR__ . '/../../_files/GoogleSearch.wsdl');
+        $a = $this->getMockFromWsdl(TEST_FILES_PATH . 'GoogleSearch.wsdl');
+        $b = $this->getMockFromWsdl(TEST_FILES_PATH . 'GoogleSearch.wsdl');
 
         $this->assertStringStartsWith('Mock_GoogleSearch_', \get_class($a));
         $this->assertEquals(\get_class($a), \get_class($b));
diff --git a/tests/Framework/MockObject/ProxyObjectTest.php b/tests/unit/Framework/MockObject/ProxyObjectTest.php
similarity index 100%
rename from tests/Framework/MockObject/ProxyObjectTest.php
rename to tests/unit/Framework/MockObject/ProxyObjectTest.php
diff --git a/tests/Framework/TestCaseTest.php b/tests/unit/Framework/TestCaseTest.php
similarity index 100%
rename from tests/Framework/TestCaseTest.php
rename to tests/unit/Framework/TestCaseTest.php
diff --git a/tests/Framework/TestFailureTest.php b/tests/unit/Framework/TestFailureTest.php
similarity index 100%
rename from tests/Framework/TestFailureTest.php
rename to tests/unit/Framework/TestFailureTest.php
diff --git a/tests/Framework/TestImplementorTest.php b/tests/unit/Framework/TestImplementorTest.php
similarity index 100%
rename from tests/Framework/TestImplementorTest.php
rename to tests/unit/Framework/TestImplementorTest.php
diff --git a/tests/Framework/TestListenerTest.php b/tests/unit/Framework/TestListenerTest.php
similarity index 100%
rename from tests/Framework/TestListenerTest.php
rename to tests/unit/Framework/TestListenerTest.php
diff --git a/tests/Framework/TestResultTest.php b/tests/unit/Framework/TestResultTest.php
similarity index 97%
rename from tests/Framework/TestResultTest.php
rename to tests/unit/Framework/TestResultTest.php
index ff8abbeb57c..45c7541c137 100644
--- a/tests/Framework/TestResultTest.php
+++ b/tests/unit/Framework/TestResultTest.php
@@ -77,7 +77,7 @@ public function canSkipCoverageProvider()
      */
     public function testCanSkipCoverage($testCase, $expectedCanSkip)
     {
-        require_once __DIR__ . '/../_files/' . $testCase . '.php';
+        require_once TEST_FILES_PATH . $testCase . '.php';
 
         $test            = new $testCase();
         $canSkipCoverage = TestResult::isAnyCoverageRequired($test);
diff --git a/tests/Framework/TestSuiteTest.php b/tests/unit/Framework/TestSuiteTest.php
similarity index 98%
rename from tests/Framework/TestSuiteTest.php
rename to tests/unit/Framework/TestSuiteTest.php
index be65d692f36..1d84f7ed6b9 100644
--- a/tests/Framework/TestSuiteTest.php
+++ b/tests/unit/Framework/TestSuiteTest.php
@@ -191,7 +191,7 @@ public function testDoNotSkipInheritedClass(): void
             'DontSkipInheritedClass'
         );
 
-        $dir = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'Inheritance' . \DIRECTORY_SEPARATOR;
+        $dir = TEST_FILES_PATH . \DIRECTORY_SEPARATOR . 'Inheritance' . \DIRECTORY_SEPARATOR;
 
         $suite->addTestFile($dir . 'InheritanceA.php');
         $suite->addTestFile($dir . 'InheritanceB.php');
diff --git a/tests/Runner/PhptTestCaseTest.php b/tests/unit/Runner/PhptTestCaseTest.php
similarity index 100%
rename from tests/Runner/PhptTestCaseTest.php
rename to tests/unit/Runner/PhptTestCaseTest.php
diff --git a/tests/Runner/ResultCacheExtensionTest.php b/tests/unit/Runner/ResultCacheExtensionTest.php
similarity index 100%
rename from tests/Runner/ResultCacheExtensionTest.php
rename to tests/unit/Runner/ResultCacheExtensionTest.php
diff --git a/tests/Runner/TestSuiteSorterTest.php b/tests/unit/Runner/TestSuiteSorterTest.php
similarity index 100%
rename from tests/Runner/TestSuiteSorterTest.php
rename to tests/unit/Runner/TestSuiteSorterTest.php
diff --git a/tests/Util/ConfigurationGeneratorTest.php b/tests/unit/Util/ConfigurationGeneratorTest.php
similarity index 100%
rename from tests/Util/ConfigurationGeneratorTest.php
rename to tests/unit/Util/ConfigurationGeneratorTest.php
diff --git a/tests/Util/ConfigurationTest.php b/tests/unit/Util/ConfigurationTest.php
similarity index 91%
rename from tests/Util/ConfigurationTest.php
rename to tests/unit/Util/ConfigurationTest.php
index ce0d2837fc5..21a7ffc9257 100644
--- a/tests/Util/ConfigurationTest.php
+++ b/tests/unit/Util/ConfigurationTest.php
@@ -24,7 +24,7 @@ class ConfigurationTest extends TestCase
     protected function setUp(): void
     {
         $this->configuration = Configuration::getInstance(
-            \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.xml'
+            TEST_FILES_PATH . 'configuration.xml'
         );
     }
 
@@ -37,7 +37,7 @@ public function testExceptionIsThrownForNotExistingConfigurationFile(): void
 
     public function testShouldReadColorsWhenTrueInConfigurationFile(): void
     {
-        $configurationFilename = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.colors.true.xml';
+        $configurationFilename = TEST_FILES_PATH . 'configuration.colors.true.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -46,7 +46,7 @@ public function testShouldReadColorsWhenTrueInConfigurationFile(): void
 
     public function testShouldReadColorsWhenFalseInConfigurationFile(): void
     {
-        $configurationFilename = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.colors.false.xml';
+        $configurationFilename = TEST_FILES_PATH . 'configuration.colors.false.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -55,7 +55,7 @@ public function testShouldReadColorsWhenFalseInConfigurationFile(): void
 
     public function testShouldReadColorsWhenEmptyInConfigurationFile(): void
     {
-        $configurationFilename = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.colors.empty.xml';
+        $configurationFilename = TEST_FILES_PATH . 'configuration.colors.empty.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -64,7 +64,7 @@ public function testShouldReadColorsWhenEmptyInConfigurationFile(): void
 
     public function testShouldReadColorsWhenInvalidInConfigurationFile(): void
     {
-        $configurationFilename = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.colors.invalid.xml';
+        $configurationFilename = TEST_FILES_PATH . 'configuration.colors.invalid.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -73,7 +73,7 @@ public function testShouldReadColorsWhenInvalidInConfigurationFile(): void
 
     public function testInvalidConfigurationGeneratesValidationErrors(): void
     {
-        $configurationFilename = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.colors.invalid.xml';
+        $configurationFilename = TEST_FILES_PATH . 'configuration.colors.invalid.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
 
         $this->assertTrue($configurationInstance->hasValidationErrors());
@@ -85,7 +85,7 @@ public function testInvalidConfigurationGeneratesValidationErrors(): void
 
     public function testShouldUseDefaultValuesForInvalidIntegers(): void
     {
-        $configurationFilename = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.columns.default.xml';
+        $configurationFilename = TEST_FILES_PATH . 'configuration.columns.default.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -248,8 +248,8 @@ public function testListenerConfigurationIsReadCorrectly(): void
                         3 => 19.78,
                         4 => null,
                         5 => new \stdClass,
-                        6 => \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'MyTestFile.php',
-                        7 => \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'MyRelativePath',
+                        6 => TEST_FILES_PATH . 'MyTestFile.php',
+                        7 => TEST_FILES_PATH . 'MyRelativePath',
                         8 => true,
                     ],
                 ],
@@ -294,8 +294,8 @@ public function testExtensionConfigurationIsReadCorrectly(): void
                         3 => 19.78,
                         4 => null,
                         5 => new \stdClass,
-                        6 => \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'MyTestFile.php',
-                        7 => \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'MyRelativePath',
+                        6 => TEST_FILES_PATH . 'MyTestFile.php',
+                        7 => TEST_FILES_PATH . 'MyRelativePath',
                     ],
                 ],
                 [
@@ -347,7 +347,7 @@ public function testPHPConfigurationIsReadCorrectly(): void
         $this->assertEquals(
             [
                 'include_path' => [
-                    \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . '.',
+                    TEST_FILES_PATH . '.',
                     '/path/to/lib'
                 ],
                 'ini'    => ['foo' => ['value' => 'bar'], 'highlight.keyword' => ['value' => '#123456'], 'highlight.string' => ['value' => 'TEST_FILES_PATH']],
@@ -375,7 +375,7 @@ public function testPHPConfigurationIsHandledCorrectly(): void
 
         $this->configuration->handlePHPConfiguration();
 
-        $path = \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . '.' . \PATH_SEPARATOR . '/path/to/lib';
+        $path = TEST_FILES_PATH . '.' . \PATH_SEPARATOR . '/path/to/lib';
         $this->assertStringStartsWith($path, \ini_get('include_path'));
         $this->assertEquals('#123456', \ini_get('highlight.keyword'));
         $this->assertEquals(TEST_FILES_PATH, \ini_get('highlight.string'));
@@ -498,7 +498,7 @@ public function testPHPUnitConfigurationIsReadCorrectly(): void
     public function testXincludeInConfiguration(): void
     {
         $configurationWithXinclude = Configuration::getInstance(
-            \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration_xinclude.xml'
+            TEST_FILES_PATH . 'configuration_xinclude.xml'
         );
 
         $this->assertConfigurationEquals(
@@ -513,7 +513,7 @@ public function testXincludeInConfiguration(): void
     public function testWithEmptyConfigurations(): void
     {
         $emptyConfiguration = Configuration::getInstance(
-            \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration_empty.xml'
+            TEST_FILES_PATH . 'configuration_empty.xml'
         );
 
         $logging = $emptyConfiguration->getLoggingConfiguration();
@@ -540,7 +540,7 @@ public function testWithEmptyConfigurations(): void
     public function testGetTestSuiteNamesReturnsTheNamesIfDefined(): void
     {
         $configuration = Configuration::getInstance(
-            \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.suites.xml'
+            TEST_FILES_PATH . 'configuration.suites.xml'
         );
 
         $names = $configuration->getTestSuiteNames();
@@ -551,7 +551,7 @@ public function testGetTestSuiteNamesReturnsTheNamesIfDefined(): void
     public function testTestSuiteConfigurationForASingleFileInASuite(): void
     {
         $configuration = Configuration::getInstance(
-            \dirname(__DIR__) . \DIRECTORY_SEPARATOR . '_files' . \DIRECTORY_SEPARATOR . 'configuration.one-file-suite.xml'
+            TEST_FILES_PATH . 'configuration.one-file-suite.xml'
         );
 
         $config = $configuration->getTestSuiteConfiguration();
diff --git a/tests/Util/GetoptTest.php b/tests/unit/Util/GetoptTest.php
similarity index 100%
rename from tests/Util/GetoptTest.php
rename to tests/unit/Util/GetoptTest.php
diff --git a/tests/Util/GlobalStateTest.php b/tests/unit/Util/GlobalStateTest.php
similarity index 100%
rename from tests/Util/GlobalStateTest.php
rename to tests/unit/Util/GlobalStateTest.php
diff --git a/tests/Util/JsonTest.php b/tests/unit/Util/JsonTest.php
similarity index 100%
rename from tests/Util/JsonTest.php
rename to tests/unit/Util/JsonTest.php
diff --git a/tests/Util/NullTestResultCacheTest.php b/tests/unit/Util/NullTestResultCacheTest.php
similarity index 100%
rename from tests/Util/NullTestResultCacheTest.php
rename to tests/unit/Util/NullTestResultCacheTest.php
diff --git a/tests/Util/PHP/AbstractPhpProcessTest.php b/tests/unit/Util/PHP/AbstractPhpProcessTest.php
similarity index 100%
rename from tests/Util/PHP/AbstractPhpProcessTest.php
rename to tests/unit/Util/PHP/AbstractPhpProcessTest.php
diff --git a/tests/Util/RegularExpressionTest.php b/tests/unit/Util/RegularExpressionTest.php
similarity index 100%
rename from tests/Util/RegularExpressionTest.php
rename to tests/unit/Util/RegularExpressionTest.php
diff --git a/tests/Util/TestDox/CliTestDoxPrinterTest.php b/tests/unit/Util/TestDox/CliTestDoxPrinterTest.php
similarity index 100%
rename from tests/Util/TestDox/CliTestDoxPrinterTest.php
rename to tests/unit/Util/TestDox/CliTestDoxPrinterTest.php
diff --git a/tests/Util/TestDox/NamePrettifierTest.php b/tests/unit/Util/TestDox/NamePrettifierTest.php
similarity index 100%
rename from tests/Util/TestDox/NamePrettifierTest.php
rename to tests/unit/Util/TestDox/NamePrettifierTest.php
diff --git a/tests/Util/TestResultCacheTest.php b/tests/unit/Util/TestResultCacheTest.php
similarity index 94%
rename from tests/Util/TestResultCacheTest.php
rename to tests/unit/Util/TestResultCacheTest.php
index b54cb90af22..3d3d987b954 100644
--- a/tests/Util/TestResultCacheTest.php
+++ b/tests/unit/Util/TestResultCacheTest.php
@@ -18,7 +18,7 @@ class TestResultCacheTest extends TestCase
 {
     public function testReadsCacheFromProvidedFilename(): void
     {
-        $cacheFile = \dirname(__DIR__) . '/_files/MultiDependencyTest_result_cache.txt';
+        $cacheFile = TEST_FILES_PATH . '/MultiDependencyTest_result_cache.txt';
         $cache     = new TestResultCache($cacheFile);
         $cache->load();
 
@@ -28,7 +28,7 @@ public function testReadsCacheFromProvidedFilename(): void
 
     public function testDoesClearCacheBeforeLoad(): void
     {
-        $cacheFile = \dirname(__DIR__) . '/_files/MultiDependencyTest_result_cache.txt';
+        $cacheFile = TEST_FILES_PATH . '/MultiDependencyTest_result_cache.txt';
         $cache     = new TestResultCache($cacheFile);
         $cache->setState('someTest', BaseTestRunner::STATUS_FAILURE);
 
diff --git a/tests/Util/TestTest.php b/tests/unit/Util/TestTest.php
similarity index 100%
rename from tests/Util/TestTest.php
rename to tests/unit/Util/TestTest.php
diff --git a/tests/Util/XmlTest.php b/tests/unit/Util/XmlTest.php
similarity index 100%
rename from tests/Util/XmlTest.php
rename to tests/unit/Util/XmlTest.php