diff --git a/tests/end-to-end/_files/groups/phpunit.xml b/tests/end-to-end/_files/groups/phpunit.xml
new file mode 100644
index 00000000000..8b2df97afce
--- /dev/null
+++ b/tests/end-to-end/_files/groups/phpunit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../../../phpunit.xsd"
+>
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/tests/end-to-end/_files/groups/tests/FooTest.php b/tests/end-to-end/_files/groups/tests/FooTest.php
new file mode 100644
index 00000000000..818255ee197
--- /dev/null
+++ b/tests/end-to-end/_files/groups/tests/FooTest.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Groups;
+
+use PHPUnit\Framework\TestCase;
+
+final class FooTest extends TestCase
+{
+    /**
+     * @group one
+     */
+    public function testOne(): void
+    {
+        $this->assertTrue(true);
+    }
+
+    /**
+     * @group two
+     */
+    public function testTwo(): void
+    {
+        $this->assertTrue(true);
+    }
+
+    public function testThree(): void
+    {
+        $this->assertTrue(true);
+    }
+}
diff --git a/tests/end-to-end/cli/exclude-group.phpt b/tests/end-to-end/cli/exclude-group-argument.phpt
similarity index 51%
rename from tests/end-to-end/cli/exclude-group.phpt
rename to tests/end-to-end/cli/exclude-group-argument.phpt
index 748dd96425c..8e9ec125237 100644
--- a/tests/end-to-end/cli/exclude-group.phpt
+++ b/tests/end-to-end/cli/exclude-group-argument.phpt
@@ -1,20 +1,23 @@
 --TEST--
-phpunit --exclude-group balanceIsInitiallyZero ../../_files/BankAccountTest.php
+phpunit --exclude-group one,two tests/FooTest.php
 --FILE--
 <?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--exclude-group';
-$_SERVER['argv'][] = 'balanceIsInitiallyZero';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = 'one,two';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups/tests/FooTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-..                                                                  2 / 2 (100%)
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' ended
+
 
 Time: %s, Memory: %s
 
-OK (2 tests, 2 assertions)
+OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/exclude-group-configuration.phpt b/tests/end-to-end/cli/exclude-group-configuration.phpt
new file mode 100644
index 00000000000..6a1fa090d15
--- /dev/null
+++ b/tests/end-to-end/cli/exclude-group-configuration.phpt
@@ -0,0 +1,23 @@
+--TEST--
+phpunit --exclude-group one,two
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups';
+$_SERVER['argv'][] = '--exclude-group';
+$_SERVER['argv'][] = 'one,two';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' ended
+
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/exclude-group-isolation.phpt b/tests/end-to-end/cli/exclude-group-isolation.phpt
deleted file mode 100644
index 3c5b4ab86b5..00000000000
--- a/tests/end-to-end/cli/exclude-group-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --exclude-group balanceIsInitiallyZero ../../_files/BankAccountTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--exclude-group';
-$_SERVER['argv'][] = 'balanceIsInitiallyZero';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-..                                                                  2 / 2 (100%)
-
-Time: %s, Memory: %s
-
-OK (2 tests, 2 assertions)
diff --git a/tests/end-to-end/cli/filter-class-isolation.phpt b/tests/end-to-end/cli/filter-class-isolation.phpt
deleted file mode 100644
index be96919f1bb..00000000000
--- a/tests/end-to-end/cli/filter-class-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter BankAccountTest ../../_files/BankAccountTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'BankAccountTest';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-...                                                                 3 / 3 (100%)
-
-Time: %s, Memory: %s
-
-OK (3 tests, 3 assertions)
diff --git a/tests/end-to-end/cli/filter-class-match-argument.phpt b/tests/end-to-end/cli/filter-class-match-argument.phpt
new file mode 100644
index 00000000000..fecd55961f3
--- /dev/null
+++ b/tests/end-to-end/cli/filter-class-match-argument.phpt
@@ -0,0 +1,27 @@
+--TEST--
+phpunit --filter FooTest tests/FooTest.php
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'FooTest';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups/tests/FooTest.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' ended
+Test 'PHPUnit\TestFixture\Groups\FooTest::testTwo' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testTwo' ended
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' ended
+
+
+Time: %s, Memory: %s
+
+OK (3 tests, 3 assertions)
diff --git a/tests/end-to-end/cli/filter-class-match-configuration.phpt b/tests/end-to-end/cli/filter-class-match-configuration.phpt
new file mode 100644
index 00000000000..592812bce8c
--- /dev/null
+++ b/tests/end-to-end/cli/filter-class-match-configuration.phpt
@@ -0,0 +1,27 @@
+--TEST--
+phpunit --filter FooTest
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'FooTest';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' ended
+Test 'PHPUnit\TestFixture\Groups\FooTest::testTwo' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testTwo' ended
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testThree' ended
+
+
+Time: %s, Memory: %s
+
+OK (3 tests, 3 assertions)
diff --git a/tests/end-to-end/cli/filter-no-results.phpt b/tests/end-to-end/cli/filter-class-nomatch-argument.phpt
similarity index 65%
rename from tests/end-to-end/cli/filter-no-results.phpt
rename to tests/end-to-end/cli/filter-class-nomatch-argument.phpt
index 5ffb03bb6ec..dc50da68678 100644
--- a/tests/end-to-end/cli/filter-no-results.phpt
+++ b/tests/end-to-end/cli/filter-class-nomatch-argument.phpt
@@ -1,12 +1,13 @@
 --TEST--
-phpunit --filter doesNotExist ../../_files/BankAccountTest.php
+phpunit --filter BarTest tests/FooTest.php
 --FILE--
 <?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'doesNotExist';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = 'BarTest';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups/tests/FooTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
diff --git a/tests/end-to-end/cli/filter-class-nomatch-configuration.phpt b/tests/end-to-end/cli/filter-class-nomatch-configuration.phpt
new file mode 100644
index 00000000000..af18263d94e
--- /dev/null
+++ b/tests/end-to-end/cli/filter-class-nomatch-configuration.phpt
@@ -0,0 +1,17 @@
+--TEST--
+phpunit --filter BarTest
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'BarTest';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+No tests executed!
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-classname-and-range-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-classname-and-range-isolation.phpt
deleted file mode 100644
index f8076476fc3..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-classname-and-range-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter DataProviderFilterTest#1-3 ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'DataProviderFilterTest#1-3';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-...                                                                 3 / 3 (100%)
-
-Time: %s, Memory: %s
-
-OK (3 tests, 3 assertions)
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-number-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-number-isolation.phpt
deleted file mode 100644
index c8226bc21d2..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-number-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter testTrue#3 ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'testTrue#3';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-.                                                                   1 / 1 (100%)
-
-Time: %s, Memory: %s
-
-OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-only-range-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-only-range-isolation.phpt
deleted file mode 100644
index 799955175ab..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-only-range-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter \#1-3 ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = '#1-3';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-...                                                                 3 / 3 (100%)
-
-Time: %s, Memory: %s
-
-OK (3 tests, 3 assertions)
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-only-regexp-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-only-regexp-isolation.phpt
deleted file mode 100644
index 73c20d3f78e..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-only-regexp-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter @false.* ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = '@false.*';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-..                                                                  2 / 2 (100%)
-
-Time: %s, Memory: %s
-
-OK (2 tests, 2 assertions)
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-only-string-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-only-string-isolation.phpt
deleted file mode 100644
index 731ed8e8737..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-only-string-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter @false\ test ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = '@false test';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-.                                                                   1 / 1 (100%)
-
-Time: %s, Memory: %s
-
-OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-range-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-range-isolation.phpt
deleted file mode 100644
index 585f0bba786..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-range-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter testTrue#1-3 ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'testTrue#1-3';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-...                                                                 3 / 3 (100%)
-
-Time: %s, Memory: %s
-
-OK (3 tests, 3 assertions)
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-regexp-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-regexp-isolation.phpt
deleted file mode 100644
index c0350f35073..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-regexp-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter testFalse@false.* ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'testFalse@false.*';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-..                                                                  2 / 2 (100%)
-
-Time: %s, Memory: %s
-
-OK (2 tests, 2 assertions)
diff --git a/tests/end-to-end/cli/filter-dataprovider-by-string-isolation.phpt b/tests/end-to-end/cli/filter-dataprovider-by-string-isolation.phpt
deleted file mode 100644
index 460073fb7da..00000000000
--- a/tests/end-to-end/cli/filter-dataprovider-by-string-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter testFalse@false\ test ../../_files/DataProviderFilterTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'testFalse@false test';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderFilterTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-.                                                                   1 / 1 (100%)
-
-Time: %s, Memory: %s
-
-OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/filter-method-isolation.phpt b/tests/end-to-end/cli/filter-method-isolation.phpt
deleted file mode 100644
index 214fc6eed75..00000000000
--- a/tests/end-to-end/cli/filter-method-isolation.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-phpunit --process-isolation --filter testBalanceIsInitiallyZero ../../_files/BankAccountTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'testBalanceIsInitiallyZero';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-.                                                                   1 / 1 (100%)
-
-Time: %s, Memory: %s
-
-OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/filter-method.phpt b/tests/end-to-end/cli/filter-method-match-argument.phpt
similarity index 55%
rename from tests/end-to-end/cli/filter-method.phpt
rename to tests/end-to-end/cli/filter-method-match-argument.phpt
index da4dc7eb446..0799cbfe0c2 100644
--- a/tests/end-to-end/cli/filter-method.phpt
+++ b/tests/end-to-end/cli/filter-method-match-argument.phpt
@@ -1,19 +1,22 @@
 --TEST--
-phpunit --filter testBalanceIsInitiallyZero ../../_files/BankAccountTest.php
+phpunit --filter testOne tests/FooTest.php
 --FILE--
 <?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'testBalanceIsInitiallyZero';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = 'testOne';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups/tests/FooTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' ended
+
 
 Time: %s, Memory: %s
 
diff --git a/tests/end-to-end/cli/filter-method-match-configuration.phpt b/tests/end-to-end/cli/filter-method-match-configuration.phpt
new file mode 100644
index 00000000000..b39ade1f257
--- /dev/null
+++ b/tests/end-to-end/cli/filter-method-match-configuration.phpt
@@ -0,0 +1,23 @@
+--TEST--
+phpunit --filter testOne
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testOne';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' ended
+
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/filter-class.phpt b/tests/end-to-end/cli/filter-method-nomatch-argument.phpt
similarity index 50%
rename from tests/end-to-end/cli/filter-class.phpt
rename to tests/end-to-end/cli/filter-method-nomatch-argument.phpt
index 1fbc66f3756..5267f187d67 100644
--- a/tests/end-to-end/cli/filter-class.phpt
+++ b/tests/end-to-end/cli/filter-method-nomatch-argument.phpt
@@ -1,20 +1,17 @@
 --TEST--
-phpunit --filter BankAccountTest ../../_files/BankAccountTest.php
+phpunit --filter testFoo tests/FooTest.php
 --FILE--
 <?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--filter';
-$_SERVER['argv'][] = 'BankAccountTest';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = 'testFoo';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups/tests/FooTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-...                                                                 3 / 3 (100%)
-
-Time: %s, Memory: %s
-
-OK (3 tests, 3 assertions)
+No tests executed!
diff --git a/tests/end-to-end/cli/filter-method-nomatch-configuration.phpt b/tests/end-to-end/cli/filter-method-nomatch-configuration.phpt
new file mode 100644
index 00000000000..449c2ba5d05
--- /dev/null
+++ b/tests/end-to-end/cli/filter-method-nomatch-configuration.phpt
@@ -0,0 +1,17 @@
+--TEST--
+phpunit --filter testFoo
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups';
+$_SERVER['argv'][] = '--filter';
+$_SERVER['argv'][] = 'testFoo';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+No tests executed!
diff --git a/tests/end-to-end/cli/group-isolation.phpt b/tests/end-to-end/cli/group-argument.phpt
similarity index 52%
rename from tests/end-to-end/cli/group-isolation.phpt
rename to tests/end-to-end/cli/group-argument.phpt
index 75ba66f3d8b..c4776fc7d93 100644
--- a/tests/end-to-end/cli/group-isolation.phpt
+++ b/tests/end-to-end/cli/group-argument.phpt
@@ -1,20 +1,22 @@
 --TEST--
-phpunit --process-isolation --group balanceIsInitiallyZero ../../_files/BankAccountTest.php
+phpunit --group one tests/FooTest.php
 --FILE--
 <?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--process-isolation';
 $_SERVER['argv'][] = '--group';
-$_SERVER['argv'][] = 'balanceIsInitiallyZero';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = 'one';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups/tests/FooTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-.                                                                   1 / 1 (100%)
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' ended
+
 
 Time: %s, Memory: %s
 
diff --git a/tests/end-to-end/cli/group-configuration.phpt b/tests/end-to-end/cli/group-configuration.phpt
new file mode 100644
index 00000000000..640aa26daf4
--- /dev/null
+++ b/tests/end-to-end/cli/group-configuration.phpt
@@ -0,0 +1,23 @@
+--TEST--
+phpunit --group one
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups';
+$_SERVER['argv'][] = '--group';
+$_SERVER['argv'][] = 'one';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' started
+Test 'PHPUnit\TestFixture\Groups\FooTest::testOne' ended
+
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/cli/group.phpt b/tests/end-to-end/cli/group.phpt
deleted file mode 100644
index 21e8b33c6b4..00000000000
--- a/tests/end-to-end/cli/group.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-phpunit --no-configuration --testdox --group 3502 ../../_files/NumericGroupAnnotationTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--testdox';
-$_SERVER['argv'][] = '--group';
-$_SERVER['argv'][] = '3502';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/NumericGroupAnnotationTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-Numeric Group Annotation (PHPUnit\TestFixture\NumericGroupAnnotation)
- ✔ Empty test for @ticket numeric annotation values
- ✔ Empty test for @group numeric annotation values
-
-Time: %s, Memory: %s
-
-OK (2 tests, 2 assertions)
diff --git a/tests/end-to-end/cli/list-groups.phpt b/tests/end-to-end/cli/list-groups-argument.phpt
similarity index 62%
rename from tests/end-to-end/cli/list-groups.phpt
rename to tests/end-to-end/cli/list-groups-argument.phpt
index 7201aad7b36..80a4e24747d 100644
--- a/tests/end-to-end/cli/list-groups.phpt
+++ b/tests/end-to-end/cli/list-groups-argument.phpt
@@ -1,11 +1,11 @@
 --TEST--
-phpunit --list-groups ../../_files/BankAccountTest.php
+phpunit --list-groups tests/FooTest.php
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--list-groups';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups/tests/FooTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 PHPUnit %s by Sebastian Bergmann and contributors.
 
 Available test group(s):
- - 1234
- - balanceCannotBecomeNegative
- - balanceIsInitiallyZero
- - specification
+ - default
+ - one
+ - two
diff --git a/tests/end-to-end/cli/list-groups-configuration.phpt b/tests/end-to-end/cli/list-groups-configuration.phpt
new file mode 100644
index 00000000000..54a5b4b5925
--- /dev/null
+++ b/tests/end-to-end/cli/list-groups-configuration.phpt
@@ -0,0 +1,18 @@
+--TEST--
+phpunit --list-groups
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/../_files/groups';
+$_SERVER['argv'][] = '--list-groups';
+
+require_once __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Available test group(s):
+ - default
+ - one
+ - two