diff --git a/tests/end-to-end/assertion.phpt b/tests/end-to-end/assertion.phpt
index ee3b6bbfa93..5877d96b1a0 100644
--- a/tests/end-to-end/assertion.phpt
+++ b/tests/end-to-end/assertion.phpt
@@ -15,8 +15,8 @@ if (ini_get('assert.exception') != 1) {
 }
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/AssertionExampleTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/AssertionExampleTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/cli/columns-max.phpt b/tests/end-to-end/cli/columns-max.phpt
index 1a63a967c9d..bacd753e2d3 100644
--- a/tests/end-to-end/cli/columns-max.phpt
+++ b/tests/end-to-end/cli/columns-max.phpt
@@ -2,9 +2,9 @@
 phpunit --columns=max ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--columns=max';
-$_SERVER['argv'][3] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--columns=max';
+$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/cli/columns.phpt b/tests/end-to-end/cli/columns.phpt
index 619dabb189d..61ca07d6fb2 100644
--- a/tests/end-to-end/cli/columns.phpt
+++ b/tests/end-to-end/cli/columns.phpt
@@ -2,9 +2,9 @@
 phpunit --columns=40 ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--columns=40';
-$_SERVER['argv'][3] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--columns=40';
+$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/cli/generate-configuration.phpt b/tests/end-to-end/cli/generate-configuration.phpt
index 341c7f3d2ef..45279a677d1 100644
--- a/tests/end-to-end/cli/generate-configuration.phpt
+++ b/tests/end-to-end/cli/generate-configuration.phpt
@@ -6,8 +6,8 @@ phpunit --generate-configuration
 
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--generate-configuration';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--generate-configuration';
 
 require __DIR__ . '/../../bootstrap.php';
 chdir(sys_get_temp_dir());
diff --git a/tests/end-to-end/cli/mycommand.phpt b/tests/end-to-end/cli/mycommand.phpt
index 15941f970ba..ecc19260d9e 100644
--- a/tests/end-to-end/cli/mycommand.phpt
+++ b/tests/end-to-end/cli/mycommand.phpt
@@ -2,17 +2,14 @@
 phpunit ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--my-option=123',
-    '--my-other-option',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--my-option=123';
+$_SERVER['argv'][] = '--my-other-option';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
-
 require __DIR__ . '/_files/MyCommand.php';
+
 MyCommand::main();
 --EXPECTF--
 MyCommand::myHandler 123
diff --git a/tests/end-to-end/cli/options-after-arguments.phpt b/tests/end-to-end/cli/options-after-arguments.phpt
index d0bbfc1e6ef..4628f2d21da 100644
--- a/tests/end-to-end/cli/options-after-arguments.phpt
+++ b/tests/end-to-end/cli/options-after-arguments.phpt
@@ -2,14 +2,12 @@
 phpunit ../../_files/BankAccountTest.php --colors
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-    '--colors=always',
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
+$_SERVER['argv'][] = '--colors=always';
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/concrete-test-class.phpt b/tests/end-to-end/concrete-test-class.phpt
index ced42d6c158..b1a3311e493 100644
--- a/tests/end-to-end/concrete-test-class.phpt
+++ b/tests/end-to-end/concrete-test-class.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/ConcreteTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/ConcreteTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/ConcreteTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/dataprovider-issue-2833.phpt b/tests/end-to-end/dataprovider-issue-2833.phpt
index 795bb28a689..70334b30db6 100644
--- a/tests/end-to-end/dataprovider-issue-2833.phpt
+++ b/tests/end-to-end/dataprovider-issue-2833.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/DataProviderIssue2833/
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/DataProviderIssue2833/';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderIssue2833/';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/dataprovider-issue-2859.phpt b/tests/end-to-end/dataprovider-issue-2859.phpt
index 835b5d3d9ed..4f90c87cf8f 100644
--- a/tests/end-to-end/dataprovider-issue-2859.phpt
+++ b/tests/end-to-end/dataprovider-issue-2859.phpt
@@ -2,8 +2,8 @@
 phpunit -c ../../_files/DataProviderIssue2859/phpunit.xml
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '-c';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/DataProviderIssue2859/phpunit.xml';
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderIssue2859/phpunit.xml';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/dataprovider-issue-2922.phpt b/tests/end-to-end/dataprovider-issue-2922.phpt
index 6797a1ff6b2..93d942860e0 100644
--- a/tests/end-to-end/dataprovider-issue-2922.phpt
+++ b/tests/end-to-end/dataprovider-issue-2922.phpt
@@ -2,9 +2,9 @@
 phpunit --exclude-group=foo ../../_files/DataProviderIssue2922/
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--exclude-group=foo';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/DataProviderIssue2922/';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--exclude-group=foo';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderIssue2922/';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/dataprovider-log-xml-isolation.phpt b/tests/end-to-end/dataprovider-log-xml-isolation.phpt
index 840a096c894..d27ac314a45 100644
--- a/tests/end-to-end/dataprovider-log-xml-isolation.phpt
+++ b/tests/end-to-end/dataprovider-log-xml-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --log-junit php://stdout ../../_files/DataProviderTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--log-junit';
-$_SERVER['argv'][4] = 'php://stdout';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--log-junit';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/dataprovider-log-xml.phpt b/tests/end-to-end/dataprovider-log-xml.phpt
index 8b9a5c84e9b..7acd588a0ae 100644
--- a/tests/end-to-end/dataprovider-log-xml.phpt
+++ b/tests/end-to-end/dataprovider-log-xml.phpt
@@ -2,10 +2,10 @@
 phpunit --log-junit php://stdout ../../_files/DataProviderTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--log-junit';
-$_SERVER['argv'][3] = 'php://stdout';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--log-junit';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/default-isolation.phpt b/tests/end-to-end/default-isolation.phpt
index ed5fa057a3f..deba73c14df 100644
--- a/tests/end-to-end/default-isolation.phpt
+++ b/tests/end-to-end/default-isolation.phpt
@@ -2,9 +2,9 @@
 phpunit --process-isolation ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/default.phpt b/tests/end-to-end/default.phpt
index 8530f70e1cd..d6e7176b8ae 100644
--- a/tests/end-to-end/default.phpt
+++ b/tests/end-to-end/default.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/defaulttestsuite-using-testsuite.phpt b/tests/end-to-end/defaulttestsuite-using-testsuite.phpt
index 4c849e5e5f3..9398059a02a 100644
--- a/tests/end-to-end/defaulttestsuite-using-testsuite.phpt
+++ b/tests/end-to-end/defaulttestsuite-using-testsuite.phpt
@@ -2,11 +2,11 @@
 phpunit --testdox --configuration=__DIR__.'/../_files/configuration.defaulttestsuite.xml' --testsuite 'First'
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--testdox';
-$_SERVER['argv'][2] = '--configuration';
-$_SERVER['argv'][3] = __DIR__.'/../_files/configuration.defaulttestsuite.xml';
-$_SERVER['argv'][4] = '--testsuite';
-$_SERVER['argv'][5] = 'First';
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__.'/../_files/configuration.defaulttestsuite.xml';
+$_SERVER['argv'][] = '--testsuite';
+$_SERVER['argv'][] = 'First';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/defaulttestsuite.phpt b/tests/end-to-end/defaulttestsuite.phpt
index 0c092811485..b4d1e8b8fdf 100644
--- a/tests/end-to-end/defaulttestsuite.phpt
+++ b/tests/end-to-end/defaulttestsuite.phpt
@@ -2,9 +2,9 @@
 phpunit --testdox --configuration=__DIR__.'/../_files/configuration.defaulttestsuite.xml'
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--testdox';
-$_SERVER['argv'][2] = '--configuration';
-$_SERVER['argv'][3] = __DIR__.'/../_files/configuration.defaulttestsuite.xml';
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__.'/../_files/configuration.defaulttestsuite.xml';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/dump-xdebug-filter.phpt b/tests/end-to-end/dump-xdebug-filter.phpt
index f7d21776cb9..f0eb8844e2d 100644
--- a/tests/end-to-end/dump-xdebug-filter.phpt
+++ b/tests/end-to-end/dump-xdebug-filter.phpt
@@ -7,10 +7,10 @@ if (!extension_loaded('xdebug')) {
 }
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '-c';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/configuration_whitelist.xml';
-$_SERVER['argv'][3] = '--dump-xdebug-filter';
-$_SERVER['argv'][4] = 'php://stderr';
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = __DIR__ . '/../_files/configuration_whitelist.xml';
+$_SERVER['argv'][] = '--dump-xdebug-filter';
+$_SERVER['argv'][] = 'php://stderr';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/empty-testcase.phpt b/tests/end-to-end/empty-testcase.phpt
index fda2a248712..385bcea9058 100644
--- a/tests/end-to-end/empty-testcase.phpt
+++ b/tests/end-to-end/empty-testcase.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/EmptyTestCaseTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/EmptyTestCaseTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/EmptyTestCaseTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/exception-stack.phpt b/tests/end-to-end/exception-stack.phpt
index 90cfe123df6..1002f29d74e 100644
--- a/tests/end-to-end/exception-stack.phpt
+++ b/tests/end-to-end/exception-stack.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/ExceptionStackTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/ExceptionStackTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/ExceptionStackTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/exclude-group-isolation.phpt b/tests/end-to-end/exclude-group-isolation.phpt
index 9e5a0516a74..bbce264474e 100644
--- a/tests/end-to-end/exclude-group-isolation.phpt
+++ b/tests/end-to-end/exclude-group-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --exclude-group balanceIsInitiallyZero ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--exclude-group';
-$_SERVER['argv'][4] = 'balanceIsInitiallyZero';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--exclude-group';
+$_SERVER['argv'][] = 'balanceIsInitiallyZero';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/exclude-group.phpt b/tests/end-to-end/exclude-group.phpt
index 2c9ff1fb559..025281680fb 100644
--- a/tests/end-to-end/exclude-group.phpt
+++ b/tests/end-to-end/exclude-group.phpt
@@ -2,10 +2,10 @@
 phpunit --exclude-group balanceIsInitiallyZero ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--exclude-group';
-$_SERVER['argv'][3] = 'balanceIsInitiallyZero';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--exclude-group';
+$_SERVER['argv'][] = 'balanceIsInitiallyZero';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/execution-order/cache-result.phpt b/tests/end-to-end/execution-order/cache-result.phpt
index 5da20cb84bc..214afd7428a 100644
--- a/tests/end-to-end/execution-order/cache-result.phpt
+++ b/tests/end-to-end/execution-order/cache-result.phpt
@@ -4,17 +4,15 @@ phpunit --order-by=no-depends,reverse --cache-result --cache-result-file ./tests
 <?php declare(strict_types=1);
 $target = tempnam(sys_get_temp_dir(), __FILE__);
 
-$arguments = [
-    '--no-configuration',
-    '--ignore-dependencies',   // keep coverage for legacy CLI option
-    '--order-by=reverse',
-    '--cache-result',
-    '--cache-result-file=' . $target,
-    realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--ignore-dependencies';   // keep coverage for legacy CLI option
+$_SERVER['argv'][] = '--order-by=reverse';
+$_SERVER['argv'][] = '--cache-result';
+$_SERVER['argv'][] = '--cache-result-file=' . $target;
+$_SERVER['argv'][] = realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main(false);
 
 print file_get_contents($target);
diff --git a/tests/end-to-end/execution-order/defects-first-order-via-cli.phpt b/tests/end-to-end/execution-order/defects-first-order-via-cli.phpt
index 1d9c0d15ee1..b33a1a5d76a 100644
--- a/tests/end-to-end/execution-order/defects-first-order-via-cli.phpt
+++ b/tests/end-to-end/execution-order/defects-first-order-via-cli.phpt
@@ -5,17 +5,15 @@ phpunit --order-by=defects ./tests/_files/MultiDependencyTest.php
 $tmpResultCache = \tempnam(sys_get_temp_dir(), __FILE__);
 \file_put_contents($tmpResultCache, file_get_contents(__DIR__ . '/_files/MultiDependencyTest_result_cache.txt'));
 
-$arguments = [
-    '--no-configuration',
-    '--debug',
-    '--order-by=defects',
-    '--cache-result',
-    '--cache-result-file=' . $tmpResultCache,
-    \realpath(__DIR__ . '/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--order-by=defects';
+$_SERVER['argv'][] = '--cache-result';
+$_SERVER['argv'][] = '--cache-result-file=' . $tmpResultCache;
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 
 \unlink($tmpResultCache);
diff --git a/tests/end-to-end/execution-order/dependencies-clone.phpt b/tests/end-to-end/execution-order/dependencies-clone.phpt
index 6bd1d387f60..802df9c7858 100644
--- a/tests/end-to-end/execution-order/dependencies-clone.phpt
+++ b/tests/end-to-end/execution-order/dependencies-clone.phpt
@@ -2,14 +2,12 @@
 phpunit --verbose ../../_files/ClonedDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--verbose',
-    \realpath(__DIR__ . '/_files/ClonedDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/ClonedDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/dependencies-isolation.phpt b/tests/end-to-end/execution-order/dependencies-isolation.phpt
index 7aeb4fba2ef..59db8de0ab9 100644
--- a/tests/end-to-end/execution-order/dependencies-isolation.phpt
+++ b/tests/end-to-end/execution-order/dependencies-isolation.phpt
@@ -2,15 +2,13 @@
 phpunit --process-isolation --verbose ../../_files/DependencyTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--process-isolation',
-    '--verbose',
-    \realpath(__DIR__ . '/_files/DependencyTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/DependencyTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt
index 64a78044b3e..8aa8cf70653 100644
--- a/tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt
+++ b/tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt
@@ -2,14 +2,12 @@
 phpunit --process-isolation _files/StackTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--process-isolation',
-    \realpath(__DIR__ . '/_files/StackTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/StackTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/depends-as-parameter.phpt b/tests/end-to-end/execution-order/depends-as-parameter.phpt
index 0d9198467a4..762d0188bc5 100644
--- a/tests/end-to-end/execution-order/depends-as-parameter.phpt
+++ b/tests/end-to-end/execution-order/depends-as-parameter.phpt
@@ -2,13 +2,11 @@
 phpunit _files/StackTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    \realpath(__DIR__ . '/_files/StackTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/StackTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt
index b12867b5821..9b7dd69b33a 100644
--- a/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt
+++ b/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt
@@ -2,14 +2,12 @@
 phpunit --process-isolation _files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--process-isolation',
-    \realpath(__DIR__ . '/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/depends-multiple-parameters.phpt b/tests/end-to-end/execution-order/depends-multiple-parameters.phpt
index 985890b6a62..74a2268f6dc 100644
--- a/tests/end-to-end/execution-order/depends-multiple-parameters.phpt
+++ b/tests/end-to-end/execution-order/depends-multiple-parameters.phpt
@@ -2,13 +2,11 @@
 phpunit _files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    \realpath(__DIR__ . '/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/execution-order-options-via-config.phpt b/tests/end-to-end/execution-order/execution-order-options-via-config.phpt
index 213c369ab08..629fe76224f 100644
--- a/tests/end-to-end/execution-order/execution-order-options-via-config.phpt
+++ b/tests/end-to-end/execution-order/execution-order-options-via-config.phpt
@@ -2,15 +2,13 @@
 phpunit -c ../_files/configuration_stop_on_defect.xml ./tests/_files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--debug',
-    '-c',
-    \realpath(__DIR__ . '/../../_files/configuration_execution_order_options.xml'),
-    \realpath(__DIR__ . '/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/configuration_execution_order_options.xml');
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/order-by-default-invalid-via-cli.phpt b/tests/end-to-end/execution-order/order-by-default-invalid-via-cli.phpt
index 114eb2222b7..2491ff2a7d2 100644
--- a/tests/end-to-end/execution-order/order-by-default-invalid-via-cli.phpt
+++ b/tests/end-to-end/execution-order/order-by-default-invalid-via-cli.phpt
@@ -2,14 +2,12 @@
 phpunit --order-by=default,foobar
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--debug',
-    '--order-by=default,foobar',
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--order-by=default,foobar';
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/order-by-duration-via-cli.phpt b/tests/end-to-end/execution-order/order-by-duration-via-cli.phpt
index 4f259ca979a..8d2863e380f 100644
--- a/tests/end-to-end/execution-order/order-by-duration-via-cli.phpt
+++ b/tests/end-to-end/execution-order/order-by-duration-via-cli.phpt
@@ -6,12 +6,12 @@ phpunit --order-by=duration ./tests/end-to-end/execution-order/_files/TestWithDi
 $tmpResultCache = tempnam(sys_get_temp_dir(), __FILE__);
 file_put_contents($tmpResultCache, file_get_contents(__DIR__ . '/_files/TestWithDifferentDurations.phpunit.result.cache.txt'));
 
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--debug';
-$_SERVER['argv'][3] = '--order-by=duration';
-$_SERVER['argv'][4] = '--cache-result';
-$_SERVER['argv'][5] = '--cache-result-file=' . $tmpResultCache;
-$_SERVER['argv'][6] = __DIR__ . '/_files/TestWithDifferentDurations.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--order-by=duration';
+$_SERVER['argv'][] = '--cache-result';
+$_SERVER['argv'][] = '--cache-result-file=' . $tmpResultCache;
+$_SERVER['argv'][] = __DIR__ . '/_files/TestWithDifferentDurations.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt b/tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt
index 02ca396854b..17bba9a490f 100644
--- a/tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt
+++ b/tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt
@@ -8,10 +8,10 @@ file_put_contents($tmpResultCache, file_get_contents(__DIR__ . '/_files/TestWith
 
 $phpunitXmlConfig = __DIR__ . '/_files/order-by-duration.phpunit.xml';
 
-$_SERVER['argv'][1] = '--configuration=' . $phpunitXmlConfig;
-$_SERVER['argv'][2] = '--debug';
-$_SERVER['argv'][3] = '--cache-result';
-$_SERVER['argv'][4] = '--cache-result-file=' . $tmpResultCache;
+$_SERVER['argv'][] = '--configuration=' . $phpunitXmlConfig;
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--cache-result';
+$_SERVER['argv'][] = '--cache-result-file=' . $tmpResultCache;
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/execution-order/repeat.phpt b/tests/end-to-end/execution-order/repeat.phpt
index 5f076bc81c8..ce95e25bea7 100644
--- a/tests/end-to-end/execution-order/repeat.phpt
+++ b/tests/end-to-end/execution-order/repeat.phpt
@@ -2,15 +2,13 @@
 phpunit --repeat 3 ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--repeat',
-    '3',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--repeat';
+$_SERVER['argv'][] = '3';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-defect-via-cli.phpt b/tests/end-to-end/execution-order/stop-on-defect-via-cli.phpt
index 24ef8d7eb92..fada8425b32 100644
--- a/tests/end-to-end/execution-order/stop-on-defect-via-cli.phpt
+++ b/tests/end-to-end/execution-order/stop-on-defect-via-cli.phpt
@@ -2,14 +2,12 @@
 phpunit --stop-on-defect ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--stop-on-defect',
-    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--stop-on-defect';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-defect-via-config.phpt b/tests/end-to-end/execution-order/stop-on-defect-via-config.phpt
index 6a99125ea10..8435ba7feca 100644
--- a/tests/end-to-end/execution-order/stop-on-defect-via-config.phpt
+++ b/tests/end-to-end/execution-order/stop-on-defect-via-config.phpt
@@ -2,14 +2,12 @@
 phpunit -c ../_files/configuration_stop_on_defect.xml ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    \realpath(__DIR__ . '/../../_files/configuration_stop_on_defect.xml'),
-    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/configuration_stop_on_defect.xml');
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-error-via-cli.phpt b/tests/end-to-end/execution-order/stop-on-error-via-cli.phpt
index 57f23a558e8..eb0dbbbd230 100644
--- a/tests/end-to-end/execution-order/stop-on-error-via-cli.phpt
+++ b/tests/end-to-end/execution-order/stop-on-error-via-cli.phpt
@@ -2,14 +2,12 @@
 phpunit --stop-on-error ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--stop-on-error',
-    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--stop-on-error';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-error-via-config.phpt b/tests/end-to-end/execution-order/stop-on-error-via-config.phpt
index acc90c38a46..6ec49dcb0d6 100644
--- a/tests/end-to-end/execution-order/stop-on-error-via-config.phpt
+++ b/tests/end-to-end/execution-order/stop-on-error-via-config.phpt
@@ -2,14 +2,12 @@
 phpunit -c ../_files/configuration_stop_on_error.xml ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    \realpath(__DIR__ . '/../../_files/configuration_stop_on_error.xml'),
-    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/configuration_stop_on_error.xml');
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-incomplete-via-cli.phpt b/tests/end-to-end/execution-order/stop-on-incomplete-via-cli.phpt
index 48ea847abb7..59ba903f033 100644
--- a/tests/end-to-end/execution-order/stop-on-incomplete-via-cli.phpt
+++ b/tests/end-to-end/execution-order/stop-on-incomplete-via-cli.phpt
@@ -2,14 +2,12 @@
 phpunit --stop-on-error ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--stop-on-incomplete',
-    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--stop-on-incomplete';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-incomplete-via-config.phpt b/tests/end-to-end/execution-order/stop-on-incomplete-via-config.phpt
index e89de94ffdd..9347cfce6f0 100644
--- a/tests/end-to-end/execution-order/stop-on-incomplete-via-config.phpt
+++ b/tests/end-to-end/execution-order/stop-on-incomplete-via-config.phpt
@@ -2,14 +2,12 @@
 phpunit -c ../_files/configuration_stop_on_incomplete.xml ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    \realpath(__DIR__ . '/../../_files/configuration_stop_on_incomplete.xml'),
-    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/configuration_stop_on_incomplete.xml');
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-warning-via-cli.phpt b/tests/end-to-end/execution-order/stop-on-warning-via-cli.phpt
index fe6a9d66036..15ad089ffef 100644
--- a/tests/end-to-end/execution-order/stop-on-warning-via-cli.phpt
+++ b/tests/end-to-end/execution-order/stop-on-warning-via-cli.phpt
@@ -2,14 +2,12 @@
 phpunit --stop-on-warning ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--stop-on-warning',
-    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--stop-on-warning';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/stop-on-warning-via-config.phpt b/tests/end-to-end/execution-order/stop-on-warning-via-config.phpt
index 6296c7ad16b..1a036e4a128 100644
--- a/tests/end-to-end/execution-order/stop-on-warning-via-config.phpt
+++ b/tests/end-to-end/execution-order/stop-on-warning-via-config.phpt
@@ -2,15 +2,13 @@
 phpunit -c ../../_files/configuration_stop_on_warning.xml --stop-on-warning ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    \realpath(__DIR__ . '/../../_files/configuration_stop_on_warning.xml'),
-    '--stop-on-warning',
-    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/configuration_stop_on_warning.xml');
+$_SERVER['argv'][] = '--stop-on-warning';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/test-order-randomized-seed-with-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-randomized-seed-with-dependency-resolution.phpt
index f59e57084a5..3c58446eee9 100644
--- a/tests/end-to-end/execution-order/test-order-randomized-seed-with-dependency-resolution.phpt
+++ b/tests/end-to-end/execution-order/test-order-randomized-seed-with-dependency-resolution.phpt
@@ -2,16 +2,14 @@
 phpunit --order-by=depends,random --random-order-seed=54321 ../_files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--debug',
-    '--order-by=depends,random',
-    '--random-order-seed=54321',
-    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--order-by=depends,random';
+$_SERVER['argv'][] = '--random-order-seed=54321';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt
index 5f2a2d1734a..ede773e51f6 100644
--- a/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt
+++ b/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt
@@ -2,16 +2,14 @@
 phpunit --order-by=depends,random ../_files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--verbose',
-    '--resolve-dependencies',     // keep coverage for legacy CLI option
-    '--order-by=depends,random',
-    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = '--resolve-dependencies';     // keep coverage for legacy CLI option
+$_SERVER['argv'][] = '--order-by=depends,random';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/test-order-reversed-with-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-reversed-with-dependency-resolution.phpt
index e103e7e2078..d29ca3eb4ca 100644
--- a/tests/end-to-end/execution-order/test-order-reversed-with-dependency-resolution.phpt
+++ b/tests/end-to-end/execution-order/test-order-reversed-with-dependency-resolution.phpt
@@ -2,16 +2,14 @@
 phpunit --verbose --order-by=depends,reverse ../execution-order/_files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--debug',
-    '--verbose',
-    '--order-by=depends,reverse',
-    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = '--order-by=depends,reverse';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/test-order-reversed-without-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-reversed-without-dependency-resolution.phpt
index 6d18367a134..c75af7febbc 100644
--- a/tests/end-to-end/execution-order/test-order-reversed-without-dependency-resolution.phpt
+++ b/tests/end-to-end/execution-order/test-order-reversed-without-dependency-resolution.phpt
@@ -2,16 +2,14 @@
 phpunit --order-by=no-depends,reverse ../_files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--debug',
-    '--verbose',
-    '--order-by=no-depends,reverse',
-    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = '--order-by=no-depends,reverse';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/execution-order/test-order-size-with-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-size-with-dependency-resolution.phpt
index 53a5b1525ce..9653fbf8699 100644
--- a/tests/end-to-end/execution-order/test-order-size-with-dependency-resolution.phpt
+++ b/tests/end-to-end/execution-order/test-order-size-with-dependency-resolution.phpt
@@ -2,16 +2,14 @@
 phpunit --verbose --order-by=depends,reverse ../execution-order/_files/MultiDependencyTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--debug',
-    '--verbose',
-    '--order-by=depends,size',
-    \realpath(__DIR__ . '/../../_files/TestWithDifferentSizes.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = '--order-by=depends,size';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/TestWithDifferentSizes.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/failure-isolation.phpt b/tests/end-to-end/failure-isolation.phpt
index ef17ec35d11..b3edc5a9a91 100644
--- a/tests/end-to-end/failure-isolation.phpt
+++ b/tests/end-to-end/failure-isolation.phpt
@@ -2,9 +2,9 @@
 phpunit --process-isolation ../../_files/FailureTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/FailureTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = __DIR__ . '/../_files/FailureTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/failure.phpt b/tests/end-to-end/failure.phpt
index 7dfa9d78ce2..72cb5b2e6ba 100644
--- a/tests/end-to-end/failure.phpt
+++ b/tests/end-to-end/failure.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/FailureTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/FailureTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/FailureTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/fatal-isolation.phpt b/tests/end-to-end/fatal-isolation.phpt
index 2f0262b8e12..ad499bf64c9 100644
--- a/tests/end-to-end/fatal-isolation.phpt
+++ b/tests/end-to-end/fatal-isolation.phpt
@@ -2,9 +2,9 @@
 phpunit --process-isolation ../../_files/FatalTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/FatalTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = __DIR__ . '/../_files/FatalTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-class-isolation.phpt b/tests/end-to-end/filter-class-isolation.phpt
index 15dd1c82eab..75d876e9914 100644
--- a/tests/end-to-end/filter-class-isolation.phpt
+++ b/tests/end-to-end/filter-class-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'BankAccountTest';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'BankAccountTest';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-class.phpt b/tests/end-to-end/filter-class.phpt
index 22b8ffa23fa..a80213a9dd8 100644
--- a/tests/end-to-end/filter-class.phpt
+++ b/tests/end-to-end/filter-class.phpt
@@ -2,10 +2,10 @@
 phpunit --filter BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'BankAccountTest';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'BankAccountTest';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
index bd81acee705..6259920ad27 100644
--- a/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter DataProviderFilterTest#1-3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'DataProviderFilterTest#1-3';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'DataProviderFilterTest#1-3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt b/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
index dbc73891eb7..199bdf64003 100644
--- a/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
@@ -2,10 +2,10 @@
 phpunit --filter DataProviderFilterTest#1-3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'DataProviderFilterTest#1-3';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'DataProviderFilterTest#1-3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
index a3058de2347..62e69713980 100644
--- a/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter testTrue#3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'testTrue#3';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testTrue#3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-number.phpt b/tests/end-to-end/filter-dataprovider-by-number.phpt
index e306974852d..e5652c9173b 100644
--- a/tests/end-to-end/filter-dataprovider-by-number.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-number.phpt
@@ -2,10 +2,10 @@
 phpunit --filter testTrue#3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'testTrue#3';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testTrue#3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
index ad6c70a20f4..680de016417 100644
--- a/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter \#1-3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = '#1-3';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '#1-3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-only-range.phpt b/tests/end-to-end/filter-dataprovider-by-only-range.phpt
index 08bf7a976fe..a1bd3284eb2 100644
--- a/tests/end-to-end/filter-dataprovider-by-only-range.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-range.phpt
@@ -2,10 +2,10 @@
 phpunit --filter \#1-3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = '#1-3';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '#1-3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
index 0bf9540883e..e9aaa9546ae 100644
--- a/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter @false.* ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = '@false.*';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '@false.*';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt b/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
index 39c8d3c170d..8fdc8eded48 100644
--- a/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
@@ -2,10 +2,10 @@
 phpunit --filter @false.* ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = '@false.*';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '@false.*';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
index 791f95ada5d..c3b75f6bff6 100644
--- a/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter @false\ test ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = '@false test';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '@false test';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-only-string.phpt b/tests/end-to-end/filter-dataprovider-by-only-string.phpt
index 1f39ab8f7d3..d3a90a666be 100644
--- a/tests/end-to-end/filter-dataprovider-by-only-string.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-only-string.phpt
@@ -2,10 +2,10 @@
 phpunit --filter @false\ test ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = '@false test';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '@false test';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
index 3b64aca618d..48d679741b1 100644
--- a/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter testTrue#1-3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'testTrue#1-3';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testTrue#1-3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-range.phpt b/tests/end-to-end/filter-dataprovider-by-range.phpt
index 5d767aa4d40..6fa49a4496e 100644
--- a/tests/end-to-end/filter-dataprovider-by-range.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-range.phpt
@@ -2,10 +2,10 @@
 phpunit --filter testTrue#1-3 ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'testTrue#1-3';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testTrue#1-3';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
index 3e768bb9306..3977bbb828e 100644
--- a/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter testFalse@false.* ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'testFalse@false.*';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testFalse@false.*';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-regexp.phpt b/tests/end-to-end/filter-dataprovider-by-regexp.phpt
index c7017b1ce30..9f5dc0a6c12 100644
--- a/tests/end-to-end/filter-dataprovider-by-regexp.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-regexp.phpt
@@ -2,10 +2,10 @@
 phpunit --filter testFalse@false.* ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'testFalse@false.*';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testFalse@false.*';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt b/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
index 3c9db80087e..3a5effb626f 100644
--- a/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter testFalse@false\ test ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'testFalse@false test';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testFalse@false test';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-dataprovider-by-string.phpt b/tests/end-to-end/filter-dataprovider-by-string.phpt
index 69c8ad4fa86..7adb2ae5689 100644
--- a/tests/end-to-end/filter-dataprovider-by-string.phpt
+++ b/tests/end-to-end/filter-dataprovider-by-string.phpt
@@ -2,10 +2,10 @@
 phpunit --filter testFalse@false\ test ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'testFalse@false test';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderFilterTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testFalse@false test';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderFilterTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-method-case-insensitive.phpt b/tests/end-to-end/filter-method-case-insensitive.phpt
index d3fd1b6a450..98db241648f 100644
--- a/tests/end-to-end/filter-method-case-insensitive.phpt
+++ b/tests/end-to-end/filter-method-case-insensitive.phpt
@@ -2,10 +2,10 @@
 phpunit --filter /balanceIsInitiallyZero/i ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = '/balanceIsInitiallyZero/i';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '/balanceIsInitiallyZero/i';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-method-case-sensitive-no-result.phpt b/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
index f5d402b895a..8fe7134981a 100644
--- a/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
+++ b/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
@@ -2,10 +2,10 @@
 phpunit --filter balanceIsInitiallyZero ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = '/balanceIsInitiallyZero/';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = '/balanceIsInitiallyZero/';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-method-isolation.phpt b/tests/end-to-end/filter-method-isolation.phpt
index 119cce3e4e7..0182bca45b3 100644
--- a/tests/end-to-end/filter-method-isolation.phpt
+++ b/tests/end-to-end/filter-method-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter testBalanceIsInitiallyZero ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'testBalanceIsInitiallyZero';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testBalanceIsInitiallyZero';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-method.phpt b/tests/end-to-end/filter-method.phpt
index ece6b57c4ba..f1e63c9b6e2 100644
--- a/tests/end-to-end/filter-method.phpt
+++ b/tests/end-to-end/filter-method.phpt
@@ -2,10 +2,10 @@
 phpunit --filter testBalanceIsInitiallyZero ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'testBalanceIsInitiallyZero';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testBalanceIsInitiallyZero';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/filter-no-results.phpt b/tests/end-to-end/filter-no-results.phpt
index 4114870be5f..2cfc2295706 100644
--- a/tests/end-to-end/filter-no-results.phpt
+++ b/tests/end-to-end/filter-no-results.phpt
@@ -2,10 +2,10 @@
 phpunit --filter doesNotExist ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--filter';
-$_SERVER['argv'][3] = 'doesNotExist';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'doesNotExist';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/forward-compatibility.phpt b/tests/end-to-end/forward-compatibility.phpt
index 8530f70e1cd..d6e7176b8ae 100644
--- a/tests/end-to-end/forward-compatibility.phpt
+++ b/tests/end-to-end/forward-compatibility.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/getActualOutputForAssertion.phpt b/tests/end-to-end/getActualOutputForAssertion.phpt
index ce89ebb9b50..cf137ece603 100644
--- a/tests/end-to-end/getActualOutputForAssertion.phpt
+++ b/tests/end-to-end/getActualOutputForAssertion.phpt
@@ -2,9 +2,9 @@
 phpunit ../../_files/ActualOutputTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--disallow-test-output';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/ActualOutputTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--disallow-test-output';
+$_SERVER['argv'][] = __DIR__ . '/../_files/ActualOutputTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/group-isolation.phpt b/tests/end-to-end/group-isolation.phpt
index bc456d173df..3a43663988f 100644
--- a/tests/end-to-end/group-isolation.phpt
+++ b/tests/end-to-end/group-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --group balanceIsInitiallyZero ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--group';
-$_SERVER['argv'][4] = 'balanceIsInitiallyZero';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--group';
+$_SERVER['argv'][] = 'balanceIsInitiallyZero';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/group.phpt b/tests/end-to-end/group.phpt
index ddf15b7da0e..a5f3ea62f0d 100644
--- a/tests/end-to-end/group.phpt
+++ b/tests/end-to-end/group.phpt
@@ -2,11 +2,11 @@
 phpunit --no-configuration --testdox --group 3502 ../../_files/NumericGroupAnnotationTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--testdox';
-$_SERVER['argv'][3] = '--group';
-$_SERVER['argv'][4] = '3502';
-$_SERVER['argv'][6] = __DIR__ . '/../_files/NumericGroupAnnotationTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--group';
+$_SERVER['argv'][] = '3502';
+$_SERVER['argv'][] = __DIR__ . '/../_files/NumericGroupAnnotationTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/ini-isolation.phpt b/tests/end-to-end/ini-isolation.phpt
index 9896a29961c..85a106d7e0f 100644
--- a/tests/end-to-end/ini-isolation.phpt
+++ b/tests/end-to-end/ini-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation -d default_mimetype=application/x-test ../../_files/IniTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '-d';
-$_SERVER['argv'][4] = 'default_mimetype=application/x-test';
-$_SERVER['argv'][6] = __DIR__ . '/../_files/IniTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '-d';
+$_SERVER['argv'][] = 'default_mimetype=application/x-test';
+$_SERVER['argv'][] = __DIR__ . '/../_files/IniTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/list-groups.phpt b/tests/end-to-end/list-groups.phpt
index 403bd7c9eec..b44378e2df4 100644
--- a/tests/end-to-end/list-groups.phpt
+++ b/tests/end-to-end/list-groups.phpt
@@ -2,9 +2,9 @@
 phpunit --list-groups ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--list-groups';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--list-groups';
+$_SERVER['argv'][] = __DIR__ . '/../_files/BankAccountTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/list-suites.phpt b/tests/end-to-end/list-suites.phpt
index 26a42bc357a..9e674d95f00 100644
--- a/tests/end-to-end/list-suites.phpt
+++ b/tests/end-to-end/list-suites.phpt
@@ -2,9 +2,9 @@
 phpunit --list-suites --configuration=__DIR__.'/../_files/configuration.suites.xml'
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--list-suites';
-$_SERVER['argv'][2] = '--configuration';
-$_SERVER['argv'][3] = __DIR__.'/../_files/configuration.suites.xml';
+$_SERVER['argv'][] = '--list-suites';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__.'/../_files/configuration.suites.xml';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/list-tests-dataprovider.phpt b/tests/end-to-end/list-tests-dataprovider.phpt
index c3364eac89d..70c2dc08122 100644
--- a/tests/end-to-end/list-tests-dataprovider.phpt
+++ b/tests/end-to-end/list-tests-dataprovider.phpt
@@ -2,9 +2,9 @@
 phpunit --list-tests ../../_files/DataProviderTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--list-tests';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/DataProviderTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--list-tests';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/list-tests-xml-dataprovider.phpt b/tests/end-to-end/list-tests-xml-dataprovider.phpt
index e151de5ef52..12ff20714d5 100644
--- a/tests/end-to-end/list-tests-xml-dataprovider.phpt
+++ b/tests/end-to-end/list-tests-xml-dataprovider.phpt
@@ -4,10 +4,10 @@ phpunit --list-tests-xml ../../_files/DataProviderTest.php
 <?php declare(strict_types=1);
 $target = tempnam(sys_get_temp_dir(), __FILE__);
 
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--list-tests-xml';
-$_SERVER['argv'][3] = $target;
-$_SERVER['argv'][4] = __DIR__ . '/../_files/DataProviderTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--list-tests-xml';
+$_SERVER['argv'][] = $target;
+$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main(false);
diff --git a/tests/end-to-end/loggers/custom-printer-debug.phpt b/tests/end-to-end/loggers/custom-printer-debug.phpt
index 5b4ec4dd844..2afc4d8f5e5 100644
--- a/tests/end-to-end/loggers/custom-printer-debug.phpt
+++ b/tests/end-to-end/loggers/custom-printer-debug.phpt
@@ -2,15 +2,13 @@
 phpunit -c ../../_files/configuration.custom-printer.xml --debug ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    \realpath(__DIR__ . '/_files/configuration.custom-printer.xml'),
-    '--debug',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/configuration.custom-printer.xml');
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/custom-printer-verbose.phpt b/tests/end-to-end/loggers/custom-printer-verbose.phpt
index aec15cff93d..682a2853d86 100644
--- a/tests/end-to-end/loggers/custom-printer-verbose.phpt
+++ b/tests/end-to-end/loggers/custom-printer-verbose.phpt
@@ -2,15 +2,13 @@
 phpunit -c _files/configuration.custom-printer.xml --verbose ../../_files/IncompleteTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    \realpath(__DIR__ . '/_files/configuration.custom-printer.xml'),
-    '--verbose',
-    \realpath(__DIR__ . '/../../_files/IncompleteTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/configuration.custom-printer.xml');
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/IncompleteTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/debug.phpt b/tests/end-to-end/loggers/debug.phpt
index 63d6aaa5a81..a1fb6c98995 100644
--- a/tests/end-to-end/loggers/debug.phpt
+++ b/tests/end-to-end/loggers/debug.phpt
@@ -4,12 +4,9 @@ phpunit --debug -c tests/basic/configuration.basic.xml
 <?php declare(strict_types=1);
 require_once(__DIR__ . '/../../bootstrap.php');
 
-$arguments = [
-    '-c',
-    \realpath(__DIR__ . '/../../basic/configuration.basic.xml'),
-    '--debug',
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../basic/configuration.basic.xml');
+$_SERVER['argv'][] = '--debug';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
diff --git a/tests/end-to-end/loggers/failure-reverse-list.phpt b/tests/end-to-end/loggers/failure-reverse-list.phpt
index 4a8ff8abbec..a8c53a3c35f 100644
--- a/tests/end-to-end/loggers/failure-reverse-list.phpt
+++ b/tests/end-to-end/loggers/failure-reverse-list.phpt
@@ -2,14 +2,12 @@
 phpunit --reverse-list ../../_files/FailureTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--reverse-list',
-    \realpath(__DIR__ . '/../../_files/FailureTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--reverse-list';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/FailureTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/hooks.phpt b/tests/end-to-end/loggers/hooks.phpt
index cffc6ebe2ef..e205b48b170 100644
--- a/tests/end-to-end/loggers/hooks.phpt
+++ b/tests/end-to-end/loggers/hooks.phpt
@@ -2,14 +2,12 @@
 phpunit --configuration _files/hooks.xml _files/HookTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--configuration',
-    \realpath(__DIR__ . '/_files/hooks.xml'),
-    \realpath(__DIR__ . '/_files/HookTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/hooks.xml');
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/HookTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/log-junit-phpt.phpt b/tests/end-to-end/loggers/log-junit-phpt.phpt
index 5e783c5032f..c71346e6834 100644
--- a/tests/end-to-end/loggers/log-junit-phpt.phpt
+++ b/tests/end-to-end/loggers/log-junit-phpt.phpt
@@ -2,15 +2,13 @@
 phpunit --log-junit php://stdout ../end-to-end/phpt-stderr.phpt
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--log-junit',
-    'php://stdout',
-    \realpath(__DIR__ . '/../phpt-stderr.phpt'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--log-junit';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../phpt-stderr.phpt');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/log-junit.phpt b/tests/end-to-end/loggers/log-junit.phpt
index 6e0794e5664..c1a2b622680 100644
--- a/tests/end-to-end/loggers/log-junit.phpt
+++ b/tests/end-to-end/loggers/log-junit.phpt
@@ -2,15 +2,13 @@
 phpunit --log-junit php://stdout _files/StatusTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--log-junit',
-    'php://stdout',
-    \realpath(__DIR__ . '/../../basic/unit/StatusTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--log-junit';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../basic/unit/StatusTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/log-teamcity-phpt.phpt b/tests/end-to-end/loggers/log-teamcity-phpt.phpt
index 999dbd07f61..d902db74bd7 100644
--- a/tests/end-to-end/loggers/log-teamcity-phpt.phpt
+++ b/tests/end-to-end/loggers/log-teamcity-phpt.phpt
@@ -2,15 +2,13 @@
 phpunit --log-teamcity php://stdout ../end-to-end/phpt-stderr.phpt
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--log-teamcity',
-    'php://stdout',
-    \realpath(__DIR__ . '/../phpt-stderr.phpt'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--log-teamcity';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../phpt-stderr.phpt');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/log-teamcity.phpt b/tests/end-to-end/loggers/log-teamcity.phpt
index 767be0b3094..a9ce127a660 100644
--- a/tests/end-to-end/loggers/log-teamcity.phpt
+++ b/tests/end-to-end/loggers/log-teamcity.phpt
@@ -2,15 +2,13 @@
 phpunit --log-teamcity php://stdout ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--log-teamcity',
-    'php://stdout',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--log-teamcity';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/teamcity-inner-exceptions.phpt b/tests/end-to-end/loggers/teamcity-inner-exceptions.phpt
index e9077a0fbdf..042d81f82da 100644
--- a/tests/end-to-end/loggers/teamcity-inner-exceptions.phpt
+++ b/tests/end-to-end/loggers/teamcity-inner-exceptions.phpt
@@ -2,14 +2,12 @@
 phpunit --teamcity ../../_files/ExceptionStackTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--teamcity',
-    \realpath(__DIR__ . '/../../_files/ExceptionStackTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--teamcity';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/ExceptionStackTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/teamcity.phpt b/tests/end-to-end/loggers/teamcity.phpt
index 2788a13f05c..f5fd9909846 100644
--- a/tests/end-to-end/loggers/teamcity.phpt
+++ b/tests/end-to-end/loggers/teamcity.phpt
@@ -2,14 +2,12 @@
 phpunit --teamcity ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--teamcity',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--teamcity';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/testdox-colors-verbose.phpt b/tests/end-to-end/loggers/testdox-colors-verbose.phpt
index 5e0250aa922..38bdb5ee315 100644
--- a/tests/end-to-end/loggers/testdox-colors-verbose.phpt
+++ b/tests/end-to-end/loggers/testdox-colors-verbose.phpt
@@ -2,16 +2,14 @@
 phpunit --testdox --colors=always --verbose -c tests/basic/configuration.basic.xml
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    realpath(__DIR__ . '/../../basic/configuration.basic.xml'),
-    '--testdox',
-    '--colors=always',
-    '--verbose'
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = realpath(__DIR__ . '/../../basic/configuration.basic.xml');
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--colors=always';
+$_SERVER['argv'][] = '--verbose';
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF_EXTERNAL--
 _files/raw_output_StatusTest.txt
diff --git a/tests/end-to-end/loggers/testdox-dataprovider-placeholder.phpt b/tests/end-to-end/loggers/testdox-dataprovider-placeholder.phpt
index c7af100388f..025b5dff95f 100644
--- a/tests/end-to-end/loggers/testdox-dataprovider-placeholder.phpt
+++ b/tests/end-to-end/loggers/testdox-dataprovider-placeholder.phpt
@@ -2,16 +2,14 @@
 phpunit --testdox --colors=always --verbose ../unit/Util/TestDox/ColorTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--testdox',
-    '--colors=always',
-    '--verbose',
-    realpath(__DIR__ . '/../../unit/Util/ColorTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--colors=always';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = realpath(__DIR__ . '/../../unit/Util/ColorTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF_EXTERNAL--
 _files/raw_output_ColorTest.txt
diff --git a/tests/end-to-end/loggers/testdox-exclude-group.phpt b/tests/end-to-end/loggers/testdox-exclude-group.phpt
index f4f8058e823..8ed57890d97 100644
--- a/tests/end-to-end/loggers/testdox-exclude-group.phpt
+++ b/tests/end-to-end/loggers/testdox-exclude-group.phpt
@@ -2,17 +2,15 @@
 phpunit --testdox-text php://stdout --testdox-exclude-group one ../../_files/TestDoxGroupTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--testdox-text',
-    'php://stdout',
-    '--testdox-exclude-group',
-    'one',
-    \realpath(__DIR__ . '/_files/TestDoxGroupTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox-text';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = '--testdox-exclude-group';
+$_SERVER['argv'][] = 'one';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/TestDoxGroupTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/testdox-force-flush.phpt b/tests/end-to-end/loggers/testdox-force-flush.phpt
index f80b71d2231..2001c601605 100644
--- a/tests/end-to-end/loggers/testdox-force-flush.phpt
+++ b/tests/end-to-end/loggers/testdox-force-flush.phpt
@@ -2,16 +2,15 @@
 phpunit --testdox --colors=never -c tests/basic/configuration.basic.xml --filter Success
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    realpath(__DIR__ . '/../../basic/configuration.basic.xml'),
-    '--testdox',
-    '--colors=never',
-    '--filter', 'Success'
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = realpath(__DIR__ . '/../../basic/configuration.basic.xml');
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--colors=never';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'Success';
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/testdox-group.phpt b/tests/end-to-end/loggers/testdox-group.phpt
index 4b9da0c24a9..5cbbd8fc45b 100644
--- a/tests/end-to-end/loggers/testdox-group.phpt
+++ b/tests/end-to-end/loggers/testdox-group.phpt
@@ -2,17 +2,15 @@
 phpunit --testdox-text php://stdout --testdox-group one ../../_files/TestDoxGroupTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--testdox-text',
-    'php://stdout',
-    '--testdox-group',
-    'one',
-    \realpath(__DIR__ . '/_files/TestDoxGroupTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox-text';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = '--testdox-group';
+$_SERVER['argv'][] = 'one';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/TestDoxGroupTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/testdox-html.phpt b/tests/end-to-end/loggers/testdox-html.phpt
index 874661097a6..a9f1a8e6a82 100644
--- a/tests/end-to-end/loggers/testdox-html.phpt
+++ b/tests/end-to-end/loggers/testdox-html.phpt
@@ -2,15 +2,13 @@
 phpunit --testdox-html php://stdout ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--testdox-html',
-    'php://stdout',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox-html';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/testdox-text.phpt b/tests/end-to-end/loggers/testdox-text.phpt
index 6c37200fea2..5f2a7dd93f0 100644
--- a/tests/end-to-end/loggers/testdox-text.phpt
+++ b/tests/end-to-end/loggers/testdox-text.phpt
@@ -2,15 +2,13 @@
 phpunit --testdox-text php://stdout ../../_files/BankAccountTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--testdox-text',
-    'php://stdout',
-    \realpath(__DIR__ . '/../../_files/BankAccountTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox-text';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/BankAccountTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/testdox-xml.phpt b/tests/end-to-end/loggers/testdox-xml.phpt
index d68d5f1fc19..f5533b301be 100644
--- a/tests/end-to-end/loggers/testdox-xml.phpt
+++ b/tests/end-to-end/loggers/testdox-xml.phpt
@@ -2,15 +2,13 @@
 phpunit --testdox-xml php://stdout ../../_files/StatusTest.php
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--testdox-xml',
-    'php://stdout',
-    \realpath(__DIR__ . '/../../basic/unit/StatusTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox-xml';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../../basic/unit/StatusTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/loggers/testdox.phpt b/tests/end-to-end/loggers/testdox.phpt
index e3e21964d19..29cb479be5c 100644
--- a/tests/end-to-end/loggers/testdox.phpt
+++ b/tests/end-to-end/loggers/testdox.phpt
@@ -2,17 +2,15 @@
 phpunit --testdox -c tests/basic/configuration.basic.xml
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '-c',
-    realpath(__DIR__ . '/../../basic/configuration.basic.xml'),
-    '--testdox',
-    '--colors=never',
-    '--no-interaction',
-    realpath(__DIR__ . '/../../unit/Util/ColorTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '-c';
+$_SERVER['argv'][] = realpath(__DIR__ . '/../../basic/configuration.basic.xml');
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--colors=never';
+$_SERVER['argv'][] = '--no-interaction';
+$_SERVER['argv'][] = realpath(__DIR__ . '/../../unit/Util/ColorTest.php');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/output-isolation.phpt b/tests/end-to-end/output-isolation.phpt
index 03a1356265f..2e3eb55fce6 100644
--- a/tests/end-to-end/output-isolation.phpt
+++ b/tests/end-to-end/output-isolation.phpt
@@ -2,11 +2,11 @@
 phpunit --process-isolation --filter testExpectOutputStringFooActualFoo ../../_files/OutputTestCase.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'testExpectOutputStringFooActualFoo';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/OutputTestCase.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testExpectOutputStringFooActualFoo';
+$_SERVER['argv'][] = __DIR__ . '/../_files/OutputTestCase.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/phar-extension-suppressed.phpt b/tests/end-to-end/phar-extension-suppressed.phpt
index 7d5bbd0dafb..89694c5b991 100644
--- a/tests/end-to-end/phar-extension-suppressed.phpt
+++ b/tests/end-to-end/phar-extension-suppressed.phpt
@@ -2,9 +2,9 @@
 phpunit --configuration tests/_files/phpunit-example-extension --no-extensions
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/phpunit-example-extension';
-$_SERVER['argv'][3] = '--no-extensions';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/phpunit-example-extension';
+$_SERVER['argv'][] = '--no-extensions';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/phar-extension.phpt b/tests/end-to-end/phar-extension.phpt
index 0bd7f82633d..ad3484a2363 100644
--- a/tests/end-to-end/phar-extension.phpt
+++ b/tests/end-to-end/phar-extension.phpt
@@ -2,8 +2,8 @@
 phpunit --configuration tests/_files/phpunit-example-extension
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/phpunit-example-extension';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/phpunit-example-extension';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/phpt-parsing.phpt b/tests/end-to-end/phpt-parsing.phpt
index 9f88f4492c3..d51a183c8ef 100644
--- a/tests/end-to-end/phpt-parsing.phpt
+++ b/tests/end-to-end/phpt-parsing.phpt
@@ -2,9 +2,9 @@
 PHPT runner supports XFAIL section
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--verbose';
-$_SERVER['argv'][3] = \realpath(__DIR__ . '/../_files/phpt-unsupported-section.phpt');
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../_files/phpt-unsupported-section.phpt');
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/phpt-xfail.phpt b/tests/end-to-end/phpt-xfail.phpt
index 2a955c13773..2c28de5a49c 100644
--- a/tests/end-to-end/phpt-xfail.phpt
+++ b/tests/end-to-end/phpt-xfail.phpt
@@ -2,8 +2,8 @@
 PHPT runner supports XFAIL section
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/phpt-xfail.phpt';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/phpt-xfail.phpt';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
@@ -15,4 +15,4 @@ I                                                                   1 / 1 (100%)
 Time: %s, Memory: %s
 
 OK, but incomplete, skipped, or risky tests!
-Tests: 1, Assertions: 1, Incomplete: 1.
\ No newline at end of file
+Tests: 1, Assertions: 1, Incomplete: 1.
diff --git a/tests/end-to-end/phpt/expect-external-location-hint.phpt b/tests/end-to-end/phpt/expect-external-location-hint.phpt
index 4104819d632..8214464b496 100644
--- a/tests/end-to-end/phpt/expect-external-location-hint.phpt
+++ b/tests/end-to-end/phpt/expect-external-location-hint.phpt
@@ -2,14 +2,12 @@
 PHPT EXPECT_EXTERNAL results in correct code location hint
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--verbose',
-    \realpath(__DIR__ . '/../_files/phpt-expect-external-location-hint-example.phpt'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../_files/phpt-expect-external-location-hint-example.phpt');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/phpt/expect-location-hint.phpt b/tests/end-to-end/phpt/expect-location-hint.phpt
index 91a16f1cf28..9d69147a6a8 100644
--- a/tests/end-to-end/phpt/expect-location-hint.phpt
+++ b/tests/end-to-end/phpt/expect-location-hint.phpt
@@ -2,14 +2,12 @@
 PHPT EXPECT comparison returns correct code location hint
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--verbose',
-    \realpath(__DIR__ . '/../_files/phpt-expect-location-hint-example.phpt'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../_files/phpt-expect-location-hint-example.phpt');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/phpt/skipif-location-hint.phpt b/tests/end-to-end/phpt/skipif-location-hint.phpt
index c6567bbc272..3933909a88b 100644
--- a/tests/end-to-end/phpt/skipif-location-hint.phpt
+++ b/tests/end-to-end/phpt/skipif-location-hint.phpt
@@ -2,14 +2,12 @@
 PHPT skip condition results in correct code location hint
 --FILE--
 <?php declare(strict_types=1);
-$arguments = [
-    '--no-configuration',
-    '--verbose',
-    \realpath(__DIR__ . '/../_files/phpt-skipif-location-hint-example.phpt'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--verbose';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../_files/phpt-skipif-location-hint-example.phpt');
 
 require __DIR__ . '/../../bootstrap.php';
+
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/regression/GitHub/1149.phpt b/tests/end-to-end/regression/GitHub/1149.phpt
index 7769d8b956d..61eb50b42b4 100644
--- a/tests/end-to-end/regression/GitHub/1149.phpt
+++ b/tests/end-to-end/regression/GitHub/1149.phpt
@@ -2,8 +2,8 @@
 GH-1149: Test swallows output buffer when run in a separate process
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/1149/Issue1149Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/1149/Issue1149Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1216.phpt b/tests/end-to-end/regression/GitHub/1216.phpt
index 429630449c9..c9be95665c7 100644
--- a/tests/end-to-end/regression/GitHub/1216.phpt
+++ b/tests/end-to-end/regression/GitHub/1216.phpt
@@ -2,12 +2,12 @@
 GH-1216: PHPUnit bootstrap must take globals vars even when the file is specified in command line
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = __DIR__ . '/1216/phpunit1216.xml';
-$_SERVER['argv'][3] = '--debug';
-$_SERVER['argv'][4] = '--bootstrap';
-$_SERVER['argv'][5] = __DIR__ . '/1216/bootstrap1216.php';
-$_SERVER['argv'][6] = __DIR__ . '/1216/Issue1216Test.php';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/1216/phpunit1216.xml';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/1216/bootstrap1216.php';
+$_SERVER['argv'][] = __DIR__ . '/1216/Issue1216Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1265.phpt b/tests/end-to-end/regression/GitHub/1265.phpt
index 5879caf4f6b..2970c4a77ea 100644
--- a/tests/end-to-end/regression/GitHub/1265.phpt
+++ b/tests/end-to-end/regression/GitHub/1265.phpt
@@ -2,9 +2,9 @@
 GH-1265: Could not use "PHPUnit\Runner\StandardTestSuiteLoader" as loader
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = __DIR__ . '/1265/phpunit1265.xml';
-$_SERVER['argv'][3] = __DIR__ . '/1265/Issue1265Test.php';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/1265/phpunit1265.xml';
+$_SERVER['argv'][] = __DIR__ . '/1265/Issue1265Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1330.phpt b/tests/end-to-end/regression/GitHub/1330.phpt
index 6bb0d34a65c..d9df634cdcf 100644
--- a/tests/end-to-end/regression/GitHub/1330.phpt
+++ b/tests/end-to-end/regression/GitHub/1330.phpt
@@ -2,10 +2,10 @@
 GH-1330: Allow non-ambiguous shortened longopts
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--deb';
-$_SERVER['argv'][2] = '--config';
-$_SERVER['argv'][3] = __DIR__ . '/1330/phpunit1330.xml';
-$_SERVER['argv'][4] = __DIR__ . '/1330/Issue1330Test.php';
+$_SERVER['argv'][] = '--deb';
+$_SERVER['argv'][] = '--config';
+$_SERVER['argv'][] = __DIR__ . '/1330/phpunit1330.xml';
+$_SERVER['argv'][] = __DIR__ . '/1330/Issue1330Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1335.phpt b/tests/end-to-end/regression/GitHub/1335.phpt
index 81e319f40ec..33486203af6 100644
--- a/tests/end-to-end/regression/GitHub/1335.phpt
+++ b/tests/end-to-end/regression/GitHub/1335.phpt
@@ -2,10 +2,10 @@
 https://github.com/sebastianbergmann/phpunit/issues/1335
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--bootstrap';
-$_SERVER['argv'][3] = __DIR__ . '/1335/bootstrap1335.php';
-$_SERVER['argv'][4] = __DIR__ . '/1335/Issue1335Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/1335/bootstrap1335.php';
+$_SERVER['argv'][] = __DIR__ . '/1335/Issue1335Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1337.phpt b/tests/end-to-end/regression/GitHub/1337.phpt
index 8218d3cf7f7..3faa53aaeb2 100644
--- a/tests/end-to-end/regression/GitHub/1337.phpt
+++ b/tests/end-to-end/regression/GitHub/1337.phpt
@@ -2,9 +2,9 @@
 https://github.com/sebastianbergmann/phpunit/issues/1337
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = __DIR__ . '/1337/Issue1337Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = __DIR__ . '/1337/Issue1337Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1348.phpt b/tests/end-to-end/regression/GitHub/1348.phpt
index b3328084294..df62ae52ab3 100644
--- a/tests/end-to-end/regression/GitHub/1348.phpt
+++ b/tests/end-to-end/regression/GitHub/1348.phpt
@@ -7,7 +7,7 @@ if (defined('HHVM_VERSION') || defined('PHPDBG_VERSION')) {
 }
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][]  = '--process-isolation';
 $_SERVER['argv'][]  = __DIR__ . '/1348/Issue1348Test.php';
 
diff --git a/tests/end-to-end/regression/GitHub/1351.phpt b/tests/end-to-end/regression/GitHub/1351.phpt
index 91c099b117c..001f58d8d2f 100644
--- a/tests/end-to-end/regression/GitHub/1351.phpt
+++ b/tests/end-to-end/regression/GitHub/1351.phpt
@@ -7,9 +7,9 @@ if (!extension_loaded('pdo') || !in_array('sqlite', PDO::getAvailableDrivers()))
 }
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = __DIR__ . '/1351/Issue1351Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = __DIR__ . '/1351/Issue1351Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1374.phpt b/tests/end-to-end/regression/GitHub/1374.phpt
index 6b564c863e6..63e090c8658 100644
--- a/tests/end-to-end/regression/GitHub/1374.phpt
+++ b/tests/end-to-end/regression/GitHub/1374.phpt
@@ -2,8 +2,8 @@
 https://github.com/sebastianbergmann/phpunit/issues/1374
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/1374/Issue1374Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/1374/Issue1374Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1437.phpt b/tests/end-to-end/regression/GitHub/1437.phpt
index 8181a3b49f4..eb3c240f98d 100644
--- a/tests/end-to-end/regression/GitHub/1437.phpt
+++ b/tests/end-to-end/regression/GitHub/1437.phpt
@@ -2,8 +2,8 @@
 https://github.com/sebastianbergmann/phpunit/issues/1437
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/1437/Issue1437Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/1437/Issue1437Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1468.phpt b/tests/end-to-end/regression/GitHub/1468.phpt
index 303e36f6d26..30aff6a514f 100644
--- a/tests/end-to-end/regression/GitHub/1468.phpt
+++ b/tests/end-to-end/regression/GitHub/1468.phpt
@@ -2,9 +2,9 @@
 https://github.com/sebastianbergmann/phpunit/issues/1468
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--disallow-todo-tests';
-$_SERVER['argv'][3] = __DIR__ . '/1468/Issue1468Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--disallow-todo-tests';
+$_SERVER['argv'][] = __DIR__ . '/1468/Issue1468Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1471.phpt b/tests/end-to-end/regression/GitHub/1471.phpt
index 594487a75ff..5384db9cfa0 100644
--- a/tests/end-to-end/regression/GitHub/1471.phpt
+++ b/tests/end-to-end/regression/GitHub/1471.phpt
@@ -2,8 +2,8 @@
 https://github.com/sebastianbergmann/phpunit/issues/1471
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/1471/Issue1471Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/1471/Issue1471Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/1570.phpt b/tests/end-to-end/regression/GitHub/1570.phpt
index ef890fe492e..fd65699eacc 100644
--- a/tests/end-to-end/regression/GitHub/1570.phpt
+++ b/tests/end-to-end/regression/GitHub/1570.phpt
@@ -2,9 +2,9 @@
 https://github.com/sebastianbergmann/phpunit/issues/1570
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--disallow-test-output';
-$_SERVER['argv'][3] = __DIR__ . '/1570/Issue1570Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--disallow-test-output';
+$_SERVER['argv'][] = __DIR__ . '/1570/Issue1570Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2085.phpt b/tests/end-to-end/regression/GitHub/2085.phpt
index d1efc5485f3..d33b0b833d4 100644
--- a/tests/end-to-end/regression/GitHub/2085.phpt
+++ b/tests/end-to-end/regression/GitHub/2085.phpt
@@ -15,10 +15,10 @@ if (!\extension_loaded('pcntl') || \strpos(\ini_get('disable_functions'), 'pcntl
 }
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--enforce-time-limit';
-$_SERVER['argv'][3] = '--default-time-limit=1';
-$_SERVER['argv'][4] = __DIR__ . '/2085/Issue2085Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--enforce-time-limit';
+$_SERVER['argv'][] = '--default-time-limit=1';
+$_SERVER['argv'][] = __DIR__ . '/2085/Issue2085Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2137-filter.phpt b/tests/end-to-end/regression/GitHub/2137-filter.phpt
index d309208a5c7..cde8d6f5534 100644
--- a/tests/end-to-end/regression/GitHub/2137-filter.phpt
+++ b/tests/end-to-end/regression/GitHub/2137-filter.phpt
@@ -2,10 +2,10 @@
 #2137: Error message for invalid dataprovider
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2137/Issue2137Test.php';
-$_SERVER['argv'][3] = '--filter';
-$_SERVER['argv'][4] = 'BrandService';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2137/Issue2137Test.php';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'BrandService';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2137-no_filter.phpt b/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
index f621bb36c6c..4fa259c71e3 100644
--- a/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
+++ b/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
@@ -2,8 +2,8 @@
 #2137: Error message for invalid dataprovider
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2137/Issue2137Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2137/Issue2137Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2145.phpt b/tests/end-to-end/regression/GitHub/2145.phpt
index 5d569636551..8389e0dc0c2 100644
--- a/tests/end-to-end/regression/GitHub/2145.phpt
+++ b/tests/end-to-end/regression/GitHub/2145.phpt
@@ -2,9 +2,9 @@
 --stop-on-failure fails to stop on PHP 7
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--stop-on-error';
-$_SERVER['argv'][3] = __DIR__ . '/2145/Issue2145Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--stop-on-error';
+$_SERVER['argv'][] = __DIR__ . '/2145/Issue2145Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2158.phpt b/tests/end-to-end/regression/GitHub/2158.phpt
index 5f933840f69..5babafdf9d0 100644
--- a/tests/end-to-end/regression/GitHub/2158.phpt
+++ b/tests/end-to-end/regression/GitHub/2158.phpt
@@ -2,8 +2,8 @@
 #2158: Failure to run tests in separate processes if a file included into main process contains constant definition
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2158/Issue2158Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2158/Issue2158Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2366.phpt b/tests/end-to-end/regression/GitHub/2366.phpt
index f7ee8fa240e..4a6a7e48df5 100644
--- a/tests/end-to-end/regression/GitHub/2366.phpt
+++ b/tests/end-to-end/regression/GitHub/2366.phpt
@@ -2,8 +2,8 @@
 #2366: Using a test double from a data provider only works once
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2366/Issue2366Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2366/Issue2366Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2380.phpt b/tests/end-to-end/regression/GitHub/2380.phpt
index 2070653a5d9..57a9d999c0e 100644
--- a/tests/end-to-end/regression/GitHub/2380.phpt
+++ b/tests/end-to-end/regression/GitHub/2380.phpt
@@ -2,8 +2,8 @@
 #2380: Data Providers cannot be generators anymore
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2380/Issue2380Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2380/Issue2380Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2382.phpt b/tests/end-to-end/regression/GitHub/2382.phpt
index d4f44c1f552..79a6c2506b8 100644
--- a/tests/end-to-end/regression/GitHub/2382.phpt
+++ b/tests/end-to-end/regression/GitHub/2382.phpt
@@ -2,8 +2,8 @@
 #2382: Data Providers throw error with uncloneable object
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2382/Issue2382Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2382/Issue2382Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2435.phpt b/tests/end-to-end/regression/GitHub/2435.phpt
index 23dbe35da05..050456f710b 100644
--- a/tests/end-to-end/regression/GitHub/2435.phpt
+++ b/tests/end-to-end/regression/GitHub/2435.phpt
@@ -2,8 +2,8 @@
 GH-2435: Test empty @group annotation
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2435/Issue2435Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2435/Issue2435Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2448-existing-test.phpt b/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
index 813c6525623..322112141b0 100644
--- a/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
+++ b/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
@@ -2,8 +2,8 @@
 #2448: Weird error when trying to run `Test` from `Test.php` but `Test.php` does not exist
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = 'Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = 'Test.php';
 
 \chdir(__DIR__ . '/2448');
 
diff --git a/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt b/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
index b5e957a8d68..fa37955952a 100644
--- a/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
+++ b/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
@@ -2,8 +2,8 @@
 #2448: Weird error when trying to run `Test` from `Test.php` but `Test.php` does not exist
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = 'Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = 'Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main(false);
diff --git a/tests/end-to-end/regression/GitHub/2724-diff-pid-from-master-process.phpt b/tests/end-to-end/regression/GitHub/2724-diff-pid-from-master-process.phpt
index 481e4e1c2eb..7531e2f69d6 100644
--- a/tests/end-to-end/regression/GitHub/2724-diff-pid-from-master-process.phpt
+++ b/tests/end-to-end/regression/GitHub/2724-diff-pid-from-master-process.phpt
@@ -2,8 +2,8 @@
 GH-2724: Missing initialization of setRunClassInSeparateProcess() for tests without data providers
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2724/SeparateClassRunMethodInNewProcessTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2724/SeparateClassRunMethodInNewProcessTest.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt b/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
index 313d3fed764..81a70e51d5d 100644
--- a/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
+++ b/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
@@ -2,8 +2,8 @@
 GH-2725: Verify that @runClassInSeparateProcess runs @beforeclass and @afterclass methods in the same process as test methods.
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2725/BeforeAfterClassPidTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2725/BeforeAfterClassPidTest.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/2731.phpt b/tests/end-to-end/regression/GitHub/2731.phpt
index b4cc5983a04..85715be0b6d 100644
--- a/tests/end-to-end/regression/GitHub/2731.phpt
+++ b/tests/end-to-end/regression/GitHub/2731.phpt
@@ -2,8 +2,8 @@
 GH-2731: Empty exception message cannot be expected
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2731/Issue2731Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2731/Issue2731Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/GitHub/2811.phpt b/tests/end-to-end/regression/GitHub/2811.phpt
index 1f6a2af4b8c..23099b13072 100644
--- a/tests/end-to-end/regression/GitHub/2811.phpt
+++ b/tests/end-to-end/regression/GitHub/2811.phpt
@@ -2,8 +2,8 @@
 GH-2811: expectExceptionMessage() does not work without expectException()
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2811/Issue2811Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2811/Issue2811Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/GitHub/2830.phpt b/tests/end-to-end/regression/GitHub/2830.phpt
index abb221185cb..d54dc5a70ae 100644
--- a/tests/end-to-end/regression/GitHub/2830.phpt
+++ b/tests/end-to-end/regression/GitHub/2830.phpt
@@ -2,8 +2,8 @@
 GH-2830: @runClassInSeparateProcess fails for tests with a @dataProvider
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2830/Issue2830Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2830/Issue2830Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/GitHub/2972.phpt b/tests/end-to-end/regression/GitHub/2972.phpt
index 0df32728544..0eab0547f4d 100644
--- a/tests/end-to-end/regression/GitHub/2972.phpt
+++ b/tests/end-to-end/regression/GitHub/2972.phpt
@@ -2,8 +2,8 @@
 GH-2972: Test suite shouldn't fail when it contains both *.phpt files and unconventionally named tests
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/2972/';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/2972/';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/3093/issue-3093-test.phpt b/tests/end-to-end/regression/GitHub/3093/issue-3093-test.phpt
index 6a6b912b720..e865c84b53e 100644
--- a/tests/end-to-end/regression/GitHub/3093/issue-3093-test.phpt
+++ b/tests/end-to-end/regression/GitHub/3093/issue-3093-test.phpt
@@ -2,9 +2,9 @@
 https://github.com/sebastianbergmann/phpunit/issues/3093
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--order-by=reverse';
-$_SERVER['argv'][3] = __DIR__ . '/Issue3093Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--order-by=reverse';
+$_SERVER['argv'][] = __DIR__ . '/Issue3093Test.php';
 
 require __DIR__ . '/../../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/322.phpt b/tests/end-to-end/regression/GitHub/322.phpt
index 6e685056bec..37504dbad06 100644
--- a/tests/end-to-end/regression/GitHub/322.phpt
+++ b/tests/end-to-end/regression/GitHub/322.phpt
@@ -2,12 +2,12 @@
 GH-322: group commandline option should override group/exclude setting in phpunit.xml
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = __DIR__ . '/322/phpunit322.xml';
-$_SERVER['argv'][3] = '--debug';
-$_SERVER['argv'][4] = '--group';
-$_SERVER['argv'][5] = 'one';
-$_SERVER['argv'][6] = __DIR__ . '/322/Issue322Test.php';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/322/phpunit322.xml';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--group';
+$_SERVER['argv'][] = 'one';
+$_SERVER['argv'][] = __DIR__ . '/322/Issue322Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/3379.phpt b/tests/end-to-end/regression/GitHub/3379.phpt
index f05dd24a24f..22ff3a24617 100644
--- a/tests/end-to-end/regression/GitHub/3379.phpt
+++ b/tests/end-to-end/regression/GitHub/3379.phpt
@@ -2,8 +2,8 @@
 GH-3379: Dependent test of skipped test has status -1
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = __DIR__ . '/3379/';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/3379/';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/3380/issue-3380-test.phpt b/tests/end-to-end/regression/GitHub/3380/issue-3380-test.phpt
index 357c2aa544f..e17b0844586 100644
--- a/tests/end-to-end/regression/GitHub/3380/issue-3380-test.phpt
+++ b/tests/end-to-end/regression/GitHub/3380/issue-3380-test.phpt
@@ -5,12 +5,12 @@ https://github.com/sebastianbergmann/phpunit/issues/3380
 $tmpResultCache = tempnam(sys_get_temp_dir(), __FILE__);
 file_put_contents($tmpResultCache, file_get_contents(__DIR__ . '/../../../../_files/DataproviderExecutionOrderTest_result_cache.txt'));
 
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--order-by=defects';
-$_SERVER['argv'][3] = '--testdox';
-$_SERVER['argv'][4] = '--cache-result';
-$_SERVER['argv'][5] = '--cache-result-file=' . $tmpResultCache;
-$_SERVER['argv'][6] = \dirname(\dirname(\dirname(__DIR__))) . '/../_files/DataproviderExecutionOrderTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--order-by=defects';
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--cache-result';
+$_SERVER['argv'][] = '--cache-result-file=' . $tmpResultCache;
+$_SERVER['argv'][] = \dirname(\dirname(\dirname(__DIR__))) . '/../_files/DataproviderExecutionOrderTest.php';
 
 require __DIR__ . '/../../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt b/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt
index cb068909991..62bc19ebaaa 100644
--- a/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt
+++ b/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt
@@ -5,12 +5,12 @@ https://github.com/sebastianbergmann/phpunit/issues/3396
 $tmpResultCache = tempnam(sys_get_temp_dir(), __FILE__);
 file_put_contents($tmpResultCache, file_get_contents(__DIR__ . '/../../../../_files/DataproviderExecutionOrderTest_result_cache.txt'));
 
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--order-by=defects';
-$_SERVER['argv'][3] = '--debug';
-$_SERVER['argv'][4] = '--cache-result';
-$_SERVER['argv'][5] = '--cache-result-file=' . $tmpResultCache;
-$_SERVER['argv'][6] = \dirname(\dirname(\dirname(__DIR__))) . '/../_files/DataproviderExecutionOrderTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--order-by=defects';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--cache-result';
+$_SERVER['argv'][] = '--cache-result-file=' . $tmpResultCache;
+$_SERVER['argv'][] = \dirname(\dirname(\dirname(__DIR__))) . '/../_files/DataproviderExecutionOrderTest.php';
 
 require __DIR__ . '/../../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/3739.phpt b/tests/end-to-end/regression/GitHub/3739.phpt
index 8294498f9d7..4518867d011 100644
--- a/tests/end-to-end/regression/GitHub/3739.phpt
+++ b/tests/end-to-end/regression/GitHub/3739.phpt
@@ -2,8 +2,8 @@
 https://github.com/sebastianbergmann/phpunit/issues/3739
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/3739/Issue3739Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/3739/Issue3739Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/GitHub/3881.phpt b/tests/end-to-end/regression/GitHub/3881.phpt
index f04fd10bdc3..5366d383183 100644
--- a/tests/end-to-end/regression/GitHub/3881.phpt
+++ b/tests/end-to-end/regression/GitHub/3881.phpt
@@ -2,8 +2,8 @@
 https://github.com/sebastianbergmann/phpunit/issues/3881
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][3] = __DIR__ . '/3881/Issue3881Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/3881/Issue3881Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/GitHub/3889.phpt b/tests/end-to-end/regression/GitHub/3889.phpt
index 6531cb68f31..82512d71c98 100644
--- a/tests/end-to-end/regression/GitHub/3889.phpt
+++ b/tests/end-to-end/regression/GitHub/3889.phpt
@@ -2,10 +2,10 @@
 https://github.com/sebastianbergmann/phpunit/issues/3889
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--test-suffix';
-$_SERVER['argv'][3] = '.test.php';
-$_SERVER['argv'][4] = __DIR__ . '/3889/Issue3889Test.test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--test-suffix';
+$_SERVER['argv'][] = '.test.php';
+$_SERVER['argv'][] = __DIR__ . '/3889/Issue3889Test.test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/GitHub/3983-1.phpt b/tests/end-to-end/regression/GitHub/3983-1.phpt
index b10e69eec97..f41391c81b3 100644
--- a/tests/end-to-end/regression/GitHub/3983-1.phpt
+++ b/tests/end-to-end/regression/GitHub/3983-1.phpt
@@ -2,8 +2,8 @@
 phpunit 3983
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/3983';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/3983';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/3983-2.phpt b/tests/end-to-end/regression/GitHub/3983-2.phpt
index 03a954f7e04..67cc0063585 100644
--- a/tests/end-to-end/regression/GitHub/3983-2.phpt
+++ b/tests/end-to-end/regression/GitHub/3983-2.phpt
@@ -2,8 +2,8 @@
 phpunit 3983/
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/3983/';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/3983/';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/433.phpt b/tests/end-to-end/regression/GitHub/433.phpt
index a35de16fba8..6228dd9cc41 100644
--- a/tests/end-to-end/regression/GitHub/433.phpt
+++ b/tests/end-to-end/regression/GitHub/433.phpt
@@ -2,8 +2,8 @@
 GH-433: expectOutputString not completely working as expected
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/433/Issue433Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/433/Issue433Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/445.phpt b/tests/end-to-end/regression/GitHub/445.phpt
index 07ffe600304..05051f55f76 100644
--- a/tests/end-to-end/regression/GitHub/445.phpt
+++ b/tests/end-to-end/regression/GitHub/445.phpt
@@ -2,9 +2,9 @@
 GH-455: expectOutputString not working in strict mode
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--disallow-test-output';
-$_SERVER['argv'][3] = __DIR__ . '/445/Issue445Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--disallow-test-output';
+$_SERVER['argv'][] = __DIR__ . '/445/Issue445Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/498.phpt b/tests/end-to-end/regression/GitHub/498.phpt
index 71ac2f6f5d9..1a8eaf78036 100644
--- a/tests/end-to-end/regression/GitHub/498.phpt
+++ b/tests/end-to-end/regression/GitHub/498.phpt
@@ -2,10 +2,10 @@
 GH-498: The test methods won't be run if a dataProvider throws Exception and --group is added in command line
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--group';
-$_SERVER['argv'][3] = 'trueOnly';
-$_SERVER['argv'][4] = __DIR__ . '/498/Issue498Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--group';
+$_SERVER['argv'][] = 'trueOnly';
+$_SERVER['argv'][] = __DIR__ . '/498/Issue498Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/503.phpt b/tests/end-to-end/regression/GitHub/503.phpt
index 21f9d3b5a3d..ce680c6094e 100644
--- a/tests/end-to-end/regression/GitHub/503.phpt
+++ b/tests/end-to-end/regression/GitHub/503.phpt
@@ -2,8 +2,8 @@
 GH-503: assertEquals() Line Ending Differences Are Obscure
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/503/Issue503Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/503/Issue503Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/581.phpt b/tests/end-to-end/regression/GitHub/581.phpt
index 2bf0143173e..c43aee7e8fa 100644
--- a/tests/end-to-end/regression/GitHub/581.phpt
+++ b/tests/end-to-end/regression/GitHub/581.phpt
@@ -2,8 +2,8 @@
 GH-581: PHPUnit_Util_Type::export adds extra newlines in Windows
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/581/Issue581Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/581/Issue581Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/74.phpt b/tests/end-to-end/regression/GitHub/74.phpt
index 61d906791cd..145e5692eca 100644
--- a/tests/end-to-end/regression/GitHub/74.phpt
+++ b/tests/end-to-end/regression/GitHub/74.phpt
@@ -2,9 +2,9 @@
 GH-74: catchable fatal error in 3.5
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = __DIR__ . '/74/Issue74Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = __DIR__ . '/74/Issue74Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/765.phpt b/tests/end-to-end/regression/GitHub/765.phpt
index 7c37776b889..94ca6f52f28 100644
--- a/tests/end-to-end/regression/GitHub/765.phpt
+++ b/tests/end-to-end/regression/GitHub/765.phpt
@@ -2,8 +2,8 @@
 GH-765: Fatal error triggered in PHPUnit when exception is thrown in data provider of a test with a dependency
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/765/Issue765Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/765/Issue765Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/797.phpt b/tests/end-to-end/regression/GitHub/797.phpt
index 33b5030634f..28b79c869a1 100644
--- a/tests/end-to-end/regression/GitHub/797.phpt
+++ b/tests/end-to-end/regression/GitHub/797.phpt
@@ -2,7 +2,7 @@
 GH-797: Disabled $preserveGlobalState does not load bootstrap.php.
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][]  = '--process-isolation';
 $_SERVER['argv'][]  = '--bootstrap';
 $_SERVER['argv'][]  = __DIR__ . '/797/bootstrap797.php';
diff --git a/tests/end-to-end/regression/GitHub/863.phpt b/tests/end-to-end/regression/GitHub/863.phpt
index cd18d6d51b1..0c6a9ce2f28 100644
--- a/tests/end-to-end/regression/GitHub/863.phpt
+++ b/tests/end-to-end/regression/GitHub/863.phpt
@@ -2,10 +2,10 @@
 GH-863: Number of tests to run calculated incorrectly when --repeat is used
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--repeat';
-$_SERVER['argv'][3] = '50';
-$_SERVER['argv'][4] = \dirname(\dirname(\dirname(__DIR__))) . '/_files/BankAccountTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--repeat';
+$_SERVER['argv'][] = '50';
+$_SERVER['argv'][] = \dirname(\dirname(\dirname(__DIR__))) . '/_files/BankAccountTest.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/GitHub/873.phpt b/tests/end-to-end/regression/GitHub/873.phpt
index 252b2b89bc3..4f2dfc98068 100644
--- a/tests/end-to-end/regression/GitHub/873.phpt
+++ b/tests/end-to-end/regression/GitHub/873.phpt
@@ -7,8 +7,8 @@ if (PHP_MAJOR_VERSION < 7) {
 }
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/873/Issue873Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/873/Issue873Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/Trac/1021.phpt b/tests/end-to-end/regression/Trac/1021.phpt
index 9d27e54c8ed..f819f16fef3 100644
--- a/tests/end-to-end/regression/Trac/1021.phpt
+++ b/tests/end-to-end/regression/Trac/1021.phpt
@@ -2,8 +2,8 @@
 #1021: Depending on a test that uses a data provider does not work
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/1021/Issue1021Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/1021/Issue1021Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/Trac/578.phpt b/tests/end-to-end/regression/Trac/578.phpt
index d1b04edac4e..924fb122b47 100644
--- a/tests/end-to-end/regression/Trac/578.phpt
+++ b/tests/end-to-end/regression/Trac/578.phpt
@@ -7,8 +7,8 @@ if (\PHP_MAJOR_VERSION >= 8) {
 }
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/578/Issue578Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/578/Issue578Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/Trac/684.phpt b/tests/end-to-end/regression/Trac/684.phpt
index 4339e365d17..4440c44a24e 100644
--- a/tests/end-to-end/regression/Trac/684.phpt
+++ b/tests/end-to-end/regression/Trac/684.phpt
@@ -2,8 +2,8 @@
 #684: Unable to find test class when no test methods exists
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/684/Issue684Test.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/684/Issue684Test.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/regression/Trac/783.phpt b/tests/end-to-end/regression/Trac/783.phpt
index 62d25e1045d..f9ef2b2467d 100644
--- a/tests/end-to-end/regression/Trac/783.phpt
+++ b/tests/end-to-end/regression/Trac/783.phpt
@@ -2,10 +2,10 @@
 #783: Tests getting executed twice when using multiple groups
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--group';
-$_SERVER['argv'][3] = 'foo,bar';
-$_SERVER['argv'][4] = __DIR__ . '/783/ParentSuite.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--group';
+$_SERVER['argv'][] = 'foo,bar';
+$_SERVER['argv'][] = __DIR__ . '/783/ParentSuite.php';
 
 require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/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
index 5d0998738a1..fc675aece12 100644
--- a/tests/end-to-end/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
@@ -2,8 +2,8 @@
 phpunit ../_files/DoesNotPerformAssertionsButPerformingAssertionsTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/DoesNotPerformAssertionsButPerformingAssertionsTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/DoesNotPerformAssertionsButPerformingAssertionsTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/report-useless-tests-incomplete.phpt b/tests/end-to-end/report-useless-tests-incomplete.phpt
index e8116dc7d63..8748579808c 100644
--- a/tests/end-to-end/report-useless-tests-incomplete.phpt
+++ b/tests/end-to-end/report-useless-tests-incomplete.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/IncompleteTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/IncompleteTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/IncompleteTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/report-useless-tests-isolation.phpt b/tests/end-to-end/report-useless-tests-isolation.phpt
index 3fb8b35760d..562a1d85b56 100644
--- a/tests/end-to-end/report-useless-tests-isolation.phpt
+++ b/tests/end-to-end/report-useless-tests-isolation.phpt
@@ -2,9 +2,9 @@
 phpunit --process-isolation ../../_files/IncompleteTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--process-isolation';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/NothingTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = __DIR__ . '/../_files/NothingTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/report-useless-tests.phpt b/tests/end-to-end/report-useless-tests.phpt
index 48249fc8b29..e15156b3a36 100644
--- a/tests/end-to-end/report-useless-tests.phpt
+++ b/tests/end-to-end/report-useless-tests.phpt
@@ -2,8 +2,8 @@
 phpunit ../../_files/NothingTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/NothingTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/NothingTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/requires-skip-code-location-hints.phpt b/tests/end-to-end/requires-skip-code-location-hints.phpt
index a25ce76fe8e..63fcfb7679e 100644
--- a/tests/end-to-end/requires-skip-code-location-hints.phpt
+++ b/tests/end-to-end/requires-skip-code-location-hints.phpt
@@ -4,11 +4,8 @@ phpunit --no-configuration ../_files/RequirementsTest.php
 <?php declare(strict_types=1);
 require_once(__DIR__ . '/../bootstrap.php');
 
-$arguments = [
-    '--no-configuration',
-    \realpath(__DIR__ . '/../_files/RequirementsTest.php'),
-];
-\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = \realpath(__DIR__ . '/../_files/RequirementsTest.php');
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
diff --git a/tests/end-to-end/separate-processes-test.phpt b/tests/end-to-end/separate-processes-test.phpt
index 0c4ff86ae26..4f5a4a49da7 100644
--- a/tests/end-to-end/separate-processes-test.phpt
+++ b/tests/end-to-end/separate-processes-test.phpt
@@ -2,8 +2,8 @@
 phpunit --no-configuration ../../_files/SeparateProcessesTest.php
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/SeparateProcessesTest.php';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/SeparateProcessesTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/test-suffix-multiple.phpt b/tests/end-to-end/test-suffix-multiple.phpt
index 33844151d2c..28e23f10399 100644
--- a/tests/end-to-end/test-suffix-multiple.phpt
+++ b/tests/end-to-end/test-suffix-multiple.phpt
@@ -2,10 +2,10 @@
 phpunit --test-suffix .test.php,.my.php ../../_files/
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--test-suffix';
-$_SERVER['argv'][3] = '.test.php,.my.php';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--test-suffix';
+$_SERVER['argv'][] = '.test.php,.my.php';
+$_SERVER['argv'][] = __DIR__ . '/../_files/';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/test-suffix-single.phpt b/tests/end-to-end/test-suffix-single.phpt
index 968323ce847..788c9010e0d 100644
--- a/tests/end-to-end/test-suffix-single.phpt
+++ b/tests/end-to-end/test-suffix-single.phpt
@@ -2,10 +2,10 @@
 phpunit --test-suffix .test.php ../../_files/
 --FILE--
 <?php declare(strict_types=1);
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--test-suffix';
-$_SERVER['argv'][3] = '.test.php';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--test-suffix';
+$_SERVER['argv'][] = '.test.php';
+$_SERVER['argv'][] = __DIR__ . '/../_files/';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/version.phpt b/tests/end-to-end/version.phpt
index bdd38596c87..d5e73f24abc 100644
--- a/tests/end-to-end/version.phpt
+++ b/tests/end-to-end/version.phpt
@@ -2,8 +2,8 @@
 phpunit --version
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--version';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--version';
 
 require __DIR__ . '/../bootstrap.php';