diff --git a/composer.json b/composer.json
index 26aae88b..f9f70763 100644
--- a/composer.json
+++ b/composer.json
@@ -107,8 +107,7 @@
                 "Pest\\Plugins\\Snapshot",
                 "Pest\\Plugins\\Verbose",
                 "Pest\\Plugins\\Version",
-                "Pest\\Plugins\\Parallel",
-                "Pest\\Plugins\\JUnit"
+                "Pest\\Plugins\\Parallel"
             ]
         },
         "phpstan": {
diff --git a/overrides/Logging/JUnit/JunitXmlLogger.php b/overrides/Logging/JUnit/JunitXmlLogger.php
index bc0e0953..a1ca5ff5 100644
--- a/overrides/Logging/JUnit/JunitXmlLogger.php
+++ b/overrides/Logging/JUnit/JunitXmlLogger.php
@@ -1,16 +1,459 @@
 <?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\Logging\JUnit;
 
+use DOMDocument;
+use DOMElement;
+use PHPUnit\Event\Code\Test;
+use PHPUnit\Event\Code\TestMethod;
+use PHPUnit\Event\EventFacadeIsSealedException;
 use PHPUnit\Event\Facade;
+use PHPUnit\Event\InvalidArgumentException;
+use PHPUnit\Event\Telemetry\HRTime;
+use PHPUnit\Event\Telemetry\Info;
+use PHPUnit\Event\Test\Errored;
+use PHPUnit\Event\Test\Failed;
+use PHPUnit\Event\Test\Finished;
+use PHPUnit\Event\Test\MarkedIncomplete;
+use PHPUnit\Event\Test\PreparationStarted;
+use PHPUnit\Event\Test\Prepared;
+use PHPUnit\Event\Test\Skipped;
+use PHPUnit\Event\TestSuite\Started;
+use PHPUnit\Event\UnknownSubscriberTypeException;
 use PHPUnit\TextUI\Output\Printer;
+use PHPUnit\Util\Xml;
 
+use function assert;
+use function basename;
+use function is_int;
+use function sprintf;
+use function str_replace;
+use function trim;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
 final class JunitXmlLogger
 {
+    private readonly Printer $printer;
+
+    private readonly \Pest\Logging\Converter $converter; // pest-added
+
+    private DOMDocument $document;
+
+    private DOMElement $root;
+
+    /**
+     * @var DOMElement[]
+     */
+    private array $testSuites = [];
+
+    /**
+     * @psalm-var array<int,int>
+     */
+    private array $testSuiteTests = [0];
+
+    /**
+     * @psalm-var array<int,int>
+     */
+    private array $testSuiteAssertions = [0];
+
+    /**
+     * @psalm-var array<int,int>
+     */
+    private array $testSuiteErrors = [0];
+
+    /**
+     * @psalm-var array<int,int>
+     */
+    private array $testSuiteFailures = [0];
+
+    /**
+     * @psalm-var array<int,int>
+     */
+    private array $testSuiteSkipped = [0];
+
+    /**
+     * @psalm-var array<int,int>
+     */
+    private array $testSuiteTimes = [0];
+
+    private int $testSuiteLevel = 0;
+
+    private ?DOMElement $currentTestCase = null;
+
+    private ?HRTime $time = null;
+
+    private bool $prepared = false;
+
+    private bool $preparationFailed = false;
+
+    /**
+     * @throws EventFacadeIsSealedException
+     * @throws UnknownSubscriberTypeException
+     */
     public function __construct(Printer $printer, Facade $facade)
     {
-        /** @see \Pest\Logging\JUnit\JUnitLogger */
+        $this->printer = $printer;
+        $this->converter = new \Pest\Logging\Converter(\Pest\Support\Container::getInstance()->get(\Pest\TestSuite::class)->rootPath); // pest-added
+
+        $this->registerSubscribers($facade);
+        $this->createDocument();
+    }
+
+    public function flush(): void
+    {
+        $this->printer->print($this->document->saveXML());
+
+        $this->printer->flush();
+    }
+
+    public function testSuiteStarted(Started $event): void
+    {
+        $testSuite = $this->document->createElement('testsuite');
+        $testSuite->setAttribute('name', $this->converter->getTestSuiteName($event->testSuite())); // pest-changed
+
+        if ($event->testSuite()->isForTestClass()) {
+            $testSuite->setAttribute('file', $this->converter->getTestSuiteLocation($event->testSuite()) ?? ''); // pest-changed
+        }
+
+        if ($this->testSuiteLevel > 0) {
+            $this->testSuites[$this->testSuiteLevel]->appendChild($testSuite);
+        } else {
+            $this->root->appendChild($testSuite);
+        }
+
+        $this->testSuiteLevel++;
+        $this->testSuites[$this->testSuiteLevel] = $testSuite;
+        $this->testSuiteTests[$this->testSuiteLevel] = 0;
+        $this->testSuiteAssertions[$this->testSuiteLevel] = 0;
+        $this->testSuiteErrors[$this->testSuiteLevel] = 0;
+        $this->testSuiteFailures[$this->testSuiteLevel] = 0;
+        $this->testSuiteSkipped[$this->testSuiteLevel] = 0;
+        $this->testSuiteTimes[$this->testSuiteLevel] = 0;
+    }
+
+    public function testSuiteFinished(): void
+    {
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+            'tests',
+            (string) $this->testSuiteTests[$this->testSuiteLevel],
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+            'assertions',
+            (string) $this->testSuiteAssertions[$this->testSuiteLevel],
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+            'errors',
+            (string) $this->testSuiteErrors[$this->testSuiteLevel],
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+            'failures',
+            (string) $this->testSuiteFailures[$this->testSuiteLevel],
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+            'skipped',
+            (string) $this->testSuiteSkipped[$this->testSuiteLevel],
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->setAttribute(
+            'time',
+            sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel]),
+        );
+
+        if ($this->testSuiteLevel > 1) {
+            $this->testSuiteTests[$this->testSuiteLevel - 1] += $this->testSuiteTests[$this->testSuiteLevel];
+            $this->testSuiteAssertions[$this->testSuiteLevel - 1] += $this->testSuiteAssertions[$this->testSuiteLevel];
+            $this->testSuiteErrors[$this->testSuiteLevel - 1] += $this->testSuiteErrors[$this->testSuiteLevel];
+            $this->testSuiteFailures[$this->testSuiteLevel - 1] += $this->testSuiteFailures[$this->testSuiteLevel];
+            $this->testSuiteSkipped[$this->testSuiteLevel - 1] += $this->testSuiteSkipped[$this->testSuiteLevel];
+            $this->testSuiteTimes[$this->testSuiteLevel - 1] += $this->testSuiteTimes[$this->testSuiteLevel];
+        }
+
+        $this->testSuiteLevel--;
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testPreparationStarted(PreparationStarted $event): void
+    {
+        $this->createTestCase($event);
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testPreparationFailed(): void
+    {
+        $this->preparationFailed = true;
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testPrepared(): void
+    {
+        $this->prepared = true;
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testFinished(Finished $event): void
+    {
+        if ($this->preparationFailed) {
+            return;
+        }
+
+        $this->handleFinish($event->telemetryInfo(), $event->numberOfAssertionsPerformed());
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testMarkedIncomplete(MarkedIncomplete $event): void
+    {
+        $this->handleIncompleteOrSkipped($event);
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testSkipped(Skipped $event): void
+    {
+        $this->handleIncompleteOrSkipped($event);
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testErrored(Errored $event): void
+    {
+        $this->handleFault($event, 'error');
+
+        $this->testSuiteErrors[$this->testSuiteLevel]++;
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function testFailed(Failed $event): void
+    {
+        $this->handleFault($event, 'failure');
+
+        $this->testSuiteFailures[$this->testSuiteLevel]++;
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    private function handleFinish(Info $telemetryInfo, int $numberOfAssertionsPerformed): void
+    {
+        assert($this->currentTestCase !== null);
+        assert($this->time !== null);
+
+        $time = $telemetryInfo->time()->duration($this->time)->asFloat();
+
+        $this->testSuiteAssertions[$this->testSuiteLevel] += $numberOfAssertionsPerformed;
+
+        $this->currentTestCase->setAttribute(
+            'assertions',
+            (string) $numberOfAssertionsPerformed,
+        );
+
+        $this->currentTestCase->setAttribute(
+            'time',
+            sprintf('%F', $time),
+        );
+
+        $this->testSuites[$this->testSuiteLevel]->appendChild(
+            $this->currentTestCase,
+        );
+
+        $this->testSuiteTests[$this->testSuiteLevel]++;
+        $this->testSuiteTimes[$this->testSuiteLevel] += $time;
+
+        $this->currentTestCase = null;
+        $this->time = null;
+        $this->prepared = false;
+    }
+
+    /**
+     * @throws EventFacadeIsSealedException
+     * @throws UnknownSubscriberTypeException
+     */
+    private function registerSubscribers(Facade $facade): void
+    {
+        $facade->registerSubscribers(
+            new TestSuiteStartedSubscriber($this),
+            new TestSuiteFinishedSubscriber($this),
+            new TestPreparationStartedSubscriber($this),
+            new TestPreparationFailedSubscriber($this),
+            new TestPreparedSubscriber($this),
+            new TestFinishedSubscriber($this),
+            new TestErroredSubscriber($this),
+            new TestFailedSubscriber($this),
+            new TestMarkedIncompleteSubscriber($this),
+            new TestSkippedSubscriber($this),
+            new TestRunnerExecutionFinishedSubscriber($this),
+        );
+    }
+
+    private function createDocument(): void
+    {
+        $this->document = new DOMDocument('1.0', 'UTF-8');
+        $this->document->formatOutput = true;
+
+        $this->root = $this->document->createElement('testsuites');
+        $this->document->appendChild($this->root);
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    private function handleFault(Errored|Failed $event, string $type): void
+    {
+        if (! $this->prepared) {
+            $this->createTestCase($event);
+        }
+
+        assert($this->currentTestCase !== null);
+
+        $buffer = $this->converter->getTestCaseMethodName($event->test()); // pest-changed
+
+        $throwable = $event->throwable();
+        $buffer .= trim(
+            $this->converter->getExceptionMessage($throwable).PHP_EOL. // pest-changed
+            $this->converter->getExceptionDetails($throwable), // pest-changed
+        );
+
+        $fault = $this->document->createElement(
+            $type,
+            Xml::prepareString($buffer),
+        );
+
+        $fault->setAttribute('type', $throwable->className());
+
+        $this->currentTestCase->appendChild($fault);
+
+        if (! $this->prepared) {
+            $this->handleFinish($event->telemetryInfo(), 0);
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    private function handleIncompleteOrSkipped(MarkedIncomplete|Skipped $event): void
+    {
+        if (! $this->prepared) {
+            $this->createTestCase($event);
+        }
+
+        assert($this->currentTestCase !== null);
+
+        $skipped = $this->document->createElement('skipped');
+
+        $this->currentTestCase->appendChild($skipped);
+
+        $this->testSuiteSkipped[$this->testSuiteLevel]++;
+
+        if (! $this->prepared) {
+            $this->handleFinish($event->telemetryInfo(), 0);
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    private function testAsString(Test $test): string
+    {
+        if ($test->isPhpt()) {
+            return basename($test->file());
+        }
+
+        assert($test instanceof TestMethod);
+
+        return sprintf(
+            '%s::%s%s',
+            $test->className(),
+            $this->name($test),
+            PHP_EOL,
+        );
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    private function name(Test $test): string
+    {
+        if ($test->isPhpt()) {
+            return basename($test->file());
+        }
+
+        assert($test instanceof TestMethod);
+
+        if (! $test->testData()->hasDataFromDataProvider()) {
+            return $test->methodName();
+        }
+
+        $dataSetName = $test->testData()->dataFromDataProvider()->dataSetName();
+
+        if (is_int($dataSetName)) {
+            return sprintf(
+                '%s with data set #%d',
+                $test->methodName(),
+                $dataSetName,
+            );
+        }
+
+        return sprintf(
+            '%s with data set "%s"',
+            $test->methodName(),
+            $dataSetName,
+        );
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     *
+     * @psalm-assert !null $this->currentTestCase
+     */
+    private function createTestCase(Errored|Failed|MarkedIncomplete|PreparationStarted|Prepared|Skipped $event): void
+    {
+        $testCase = $this->document->createElement('testcase');
+
+        $test = $event->test();
+        $file = $this->converter->getTestCaseLocation($test); // pest-added
+
+        $testCase->setAttribute('name', $this->converter->getTestCaseMethodName($test)); // pest-changed
+        $testCase->setAttribute('file', $file); // pest-changed
+
+        if ($test->isTestMethod()) {
+            assert($test instanceof TestMethod);
+
+            //$testCase->setAttribute('line', (string) $test->line()); // pest-removed
+            $className = $this->converter->getTrimmedTestClassName($test); // pest-added
+            $testCase->setAttribute('class', $className); // pest-changed
+            $testCase->setAttribute('classname', str_replace('\\', '.', $className)); // pest-changed
+        }
+
+        $this->currentTestCase = $testCase;
+        $this->time = $event->telemetryInfo()->time();
     }
 }
diff --git a/src/Bootstrappers/BootSubscribers.php b/src/Bootstrappers/BootSubscribers.php
index ad4ab7da..248b9dde 100644
--- a/src/Bootstrappers/BootSubscribers.php
+++ b/src/Bootstrappers/BootSubscribers.php
@@ -25,7 +25,6 @@ final class BootSubscribers implements Bootstrapper
         Subscribers\EnsureIgnorableTestCasesAreIgnored::class,
         Subscribers\EnsureKernelDumpIsFlushed::class,
         Subscribers\EnsureTeamCityEnabled::class,
-        Subscribers\EnsureJunitEnabled::class,
     ];
 
     /**
diff --git a/src/Logging/JUnit/JUnitLogger.php b/src/Logging/JUnit/JUnitLogger.php
deleted file mode 100644
index ba71f88f..00000000
--- a/src/Logging/JUnit/JUnitLogger.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit;
-
-use DOMDocument;
-use DOMElement;
-use Pest\Logging\Converter;
-use Pest\Logging\JUnit\Subscriber\TestErroredSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestFailedSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestFinishedSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestMarkedIncompleteSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestPreparedSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestRunnerExecutionFinishedSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestSkippedSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestSuiteFinishedSubscriber;
-use Pest\Logging\JUnit\Subscriber\TestSuiteStartedSubscriber;
-use PHPUnit\Event\EventFacadeIsSealedException;
-use PHPUnit\Event\Facade;
-use PHPUnit\Event\InvalidArgumentException;
-use PHPUnit\Event\Telemetry\HRTime;
-use PHPUnit\Event\Telemetry\Info;
-use PHPUnit\Event\Test\Errored;
-use PHPUnit\Event\Test\Failed;
-use PHPUnit\Event\Test\Finished;
-use PHPUnit\Event\Test\MarkedIncomplete;
-use PHPUnit\Event\Test\Prepared;
-use PHPUnit\Event\Test\Skipped;
-use PHPUnit\Event\TestData\NoDataSetFromDataProviderException;
-use PHPUnit\Event\TestSuite\Started;
-use PHPUnit\Event\UnknownSubscriberTypeException;
-use PHPUnit\TextUI\Output\Printer;
-use PHPUnit\Util\Xml;
-
-/**
- * @internal
- */
-final class JUnitLogger
-{
-    private DOMDocument $document;
-
-    private DOMElement $root;
-
-    /**
-     * @var DOMElement[]
-     */
-    private array $testSuites = [];
-
-    /**
-     * @psalm-var array<int,int>
-     */
-    private array $testSuiteTests = [0];
-
-    /**
-     * @psalm-var array<int,int>
-     */
-    private array $testSuiteAssertions = [0];
-
-    /**
-     * @psalm-var array<int,int>
-     */
-    private array $testSuiteErrors = [0];
-
-    /**
-     * @psalm-var array<int,int>
-     */
-    private array $testSuiteFailures = [0];
-
-    /**
-     * @psalm-var array<int,int>
-     */
-    private array $testSuiteSkipped = [0];
-
-    /**
-     * @psalm-var array<int,int|float>
-     */
-    private array $testSuiteTimes = [0];
-
-    private int $testSuiteLevel = 0;
-
-    private ?DOMElement $currentTestCase = null;
-
-    private ?HRTime $time = null;
-
-    private bool $prepared = false;
-
-    /**
-     * @throws EventFacadeIsSealedException
-     * @throws UnknownSubscriberTypeException
-     */
-    public function __construct(
-        private readonly Printer $printer,
-        private readonly Converter $converter,
-    ) {
-        $this->registerSubscribers();
-        $this->createDocument();
-    }
-
-    public function flush(): void
-    {
-        $this->printer->print((string) $this->document->saveXML());
-
-        $this->printer->flush();
-    }
-
-    public function testSuiteStarted(Started $event): void
-    {
-        $testSuite = $this->document->createElement('testsuite');
-        $testSuite->setAttribute('name', $this->converter->getTestSuiteName($event->testSuite()));
-
-        if ($event->testSuite()->isForTestClass()) {
-            $testSuite->setAttribute('file', $this->converter->getTestSuiteLocation($event->testSuite()) ?? '');
-        }
-
-        if ($this->testSuiteLevel > 0) {
-            $this->testSuites[$this->testSuiteLevel]->appendChild($testSuite);
-        } else {
-            $this->root->appendChild($testSuite);
-        }
-
-        $this->testSuiteLevel++;
-        $this->testSuites[$this->testSuiteLevel] = $testSuite;
-        $this->testSuiteTests[$this->testSuiteLevel] = 0;
-        $this->testSuiteAssertions[$this->testSuiteLevel] = 0;
-        $this->testSuiteErrors[$this->testSuiteLevel] = 0;
-        $this->testSuiteFailures[$this->testSuiteLevel] = 0;
-        $this->testSuiteSkipped[$this->testSuiteLevel] = 0;
-        $this->testSuiteTimes[$this->testSuiteLevel] = 0;
-    }
-
-    public function testSuiteFinished(): void
-    {
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'tests',
-            (string) $this->testSuiteTests[$this->testSuiteLevel],
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'assertions',
-            (string) $this->testSuiteAssertions[$this->testSuiteLevel],
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'errors',
-            (string) $this->testSuiteErrors[$this->testSuiteLevel],
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'failures',
-            (string) $this->testSuiteFailures[$this->testSuiteLevel],
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'skipped',
-            (string) $this->testSuiteSkipped[$this->testSuiteLevel],
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'time',
-            sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel]),
-        );
-
-        if ($this->testSuiteLevel > 1) {
-            $this->testSuiteTests[$this->testSuiteLevel - 1] += $this->testSuiteTests[$this->testSuiteLevel];
-            $this->testSuiteAssertions[$this->testSuiteLevel - 1] += $this->testSuiteAssertions[$this->testSuiteLevel];
-            $this->testSuiteErrors[$this->testSuiteLevel - 1] += $this->testSuiteErrors[$this->testSuiteLevel];
-            $this->testSuiteFailures[$this->testSuiteLevel - 1] += $this->testSuiteFailures[$this->testSuiteLevel];
-            $this->testSuiteSkipped[$this->testSuiteLevel - 1] += $this->testSuiteSkipped[$this->testSuiteLevel];
-            $this->testSuiteTimes[$this->testSuiteLevel - 1] += $this->testSuiteTimes[$this->testSuiteLevel];
-        }
-
-        $this->testSuiteLevel--;
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     */
-    public function testPrepared(Prepared $event): void
-    {
-        $this->createTestCase($event);
-        $this->prepared = true;
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     */
-    public function testFinished(Finished $event): void
-    {
-        $this->handleFinish($event->telemetryInfo(), $event->numberOfAssertionsPerformed());
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     */
-    public function testMarkedIncomplete(MarkedIncomplete $event): void
-    {
-        $this->handleIncompleteOrSkipped($event);
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     */
-    public function testSkipped(Skipped $event): void
-    {
-        $this->handleIncompleteOrSkipped($event);
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     */
-    public function testErrored(Errored $event): void
-    {
-        $this->handleFault($event, 'error');
-
-        $this->testSuiteErrors[$this->testSuiteLevel]++;
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     */
-    public function testFailed(Failed $event): void
-    {
-        $this->handleFault($event, 'failure');
-
-        $this->testSuiteFailures[$this->testSuiteLevel]++;
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     */
-    private function handleFinish(Info $telemetryInfo, int $numberOfAssertionsPerformed): void
-    {
-        assert($this->currentTestCase instanceof \DOMElement);
-        assert($this->time instanceof \PHPUnit\Event\Telemetry\HRTime);
-
-        $time = $telemetryInfo->time()->duration($this->time)->asFloat();
-
-        $this->testSuiteAssertions[$this->testSuiteLevel] += $numberOfAssertionsPerformed;
-
-        $this->currentTestCase->setAttribute(
-            'assertions',
-            (string) $numberOfAssertionsPerformed,
-        );
-
-        $this->currentTestCase->setAttribute(
-            'time',
-            sprintf('%F', $time),
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->appendChild(
-            $this->currentTestCase,
-        );
-
-        $this->testSuiteTests[$this->testSuiteLevel]++;
-        $this->testSuiteTimes[$this->testSuiteLevel] += $time;
-
-        $this->currentTestCase = null;
-        $this->time = null;
-        $this->prepared = false;
-    }
-
-    /**
-     * @throws EventFacadeIsSealedException
-     * @throws UnknownSubscriberTypeException
-     */
-    private function registerSubscribers(): void
-    {
-        $subscribers = [
-            new TestSuiteStartedSubscriber($this),
-            new TestSuiteFinishedSubscriber($this),
-            new TestPreparedSubscriber($this),
-            new TestFinishedSubscriber($this),
-            new TestErroredSubscriber($this),
-            new TestFailedSubscriber($this),
-            new TestMarkedIncompleteSubscriber($this),
-            new TestSkippedSubscriber($this),
-            new TestRunnerExecutionFinishedSubscriber($this),
-        ];
-
-        Facade::instance()->registerSubscribers(...$subscribers);
-    }
-
-    private function createDocument(): void
-    {
-        $this->document = new DOMDocument('1.0', 'UTF-8');
-        $this->document->formatOutput = true;
-
-        $this->root = $this->document->createElement('testsuites');
-        $this->document->appendChild($this->root);
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     */
-    private function handleFault(Errored|Failed $event, string $type): void
-    {
-        if (! $this->prepared) {
-            $this->createTestCase($event);
-        }
-
-        assert($this->currentTestCase instanceof \DOMElement);
-
-        $throwable = $event->throwable();
-
-        $testName = $this->converter->getTestCaseMethodName($event->test());
-        $message = $this->converter->getExceptionMessage($throwable);
-        $details = $this->converter->getExceptionDetails($throwable);
-
-        $buffer = $testName;
-        $buffer .= trim(
-            $message.PHP_EOL.
-            $details,
-        );
-
-        $fault = $this->document->createElement(
-            $type,
-            Xml::prepareString($buffer),
-        );
-
-        $fault->setAttribute('type', $throwable->className());
-
-        $this->currentTestCase->appendChild($fault);
-
-        if (! $this->prepared) {
-            $this->handleFinish($event->telemetryInfo(), 0);
-        }
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     */
-    private function handleIncompleteOrSkipped(MarkedIncomplete|Skipped $event): void
-    {
-        if (! $this->prepared) {
-            $this->createTestCase($event);
-        }
-
-        assert($this->currentTestCase instanceof \DOMElement);
-
-        $skipped = $this->document->createElement('skipped');
-
-        $this->currentTestCase->appendChild($skipped);
-
-        $this->testSuiteSkipped[$this->testSuiteLevel]++;
-
-        if (! $this->prepared) {
-            $this->handleFinish($event->telemetryInfo(), 0);
-        }
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws NoDataSetFromDataProviderException
-     *
-     * @psalm-assert !null $this->currentTestCase
-     */
-    private function createTestCase(Errored|Failed|MarkedIncomplete|Prepared|Skipped $event): void
-    {
-        $testCase = $this->document->createElement('testcase');
-
-        $test = $event->test();
-        $file = $this->converter->getTestCaseLocation($test);
-
-        $testCase->setAttribute('name', $this->converter->getTestCaseMethodName($test));
-        $testCase->setAttribute('file', $file);
-
-        if ($test->isTestMethod()) {
-            $className = $this->converter->getTrimmedTestClassName($test);
-            $testCase->setAttribute('class', $className);
-            $testCase->setAttribute('classname', str_replace('\\', '.', $className));
-        }
-
-        $this->currentTestCase = $testCase;
-        $this->time = $event->telemetryInfo()->time();
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/Subscriber.php b/src/Logging/JUnit/Subscriber/Subscriber.php
deleted file mode 100644
index 7ffa1f34..00000000
--- a/src/Logging/JUnit/Subscriber/Subscriber.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use Pest\Logging\JUnit\JUnitLogger;
-
-/**
- * @internal
- */
-abstract class Subscriber
-{
-    /**
-     * Creates a new Subscriber instance.
-     */
-    public function __construct(private readonly JUnitLogger $logger)
-    {
-    }
-
-    /**
-     * Creates a new JunitLogger instance.
-     */
-    final protected function logger(): JUnitLogger
-    {
-        return $this->logger;
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestErroredSubscriber.php b/src/Logging/JUnit/Subscriber/TestErroredSubscriber.php
deleted file mode 100644
index 87172774..00000000
--- a/src/Logging/JUnit/Subscriber/TestErroredSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\Test\Errored;
-use PHPUnit\Event\Test\ErroredSubscriber;
-
-/**
- * @internal
- */
-final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber
-{
-    public function notify(Errored $event): void
-    {
-        $this->logger()->testErrored($event);
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestFailedSubscriber.php b/src/Logging/JUnit/Subscriber/TestFailedSubscriber.php
deleted file mode 100644
index d0f6c1ea..00000000
--- a/src/Logging/JUnit/Subscriber/TestFailedSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\Test\Failed;
-use PHPUnit\Event\Test\FailedSubscriber;
-
-/**
- * @internal
- */
-final class TestFailedSubscriber extends Subscriber implements FailedSubscriber
-{
-    public function notify(Failed $event): void
-    {
-        $this->logger()->testFailed($event);
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php b/src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php
deleted file mode 100644
index 4c1e937d..00000000
--- a/src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\Test\Finished;
-use PHPUnit\Event\Test\FinishedSubscriber;
-
-/**
- * @internal
- */
-final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber
-{
-    public function notify(Finished $event): void
-    {
-        $this->logger()->testFinished($event);
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestMarkedIncompleteSubscriber.php b/src/Logging/JUnit/Subscriber/TestMarkedIncompleteSubscriber.php
deleted file mode 100644
index 4ed5d693..00000000
--- a/src/Logging/JUnit/Subscriber/TestMarkedIncompleteSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\Test\MarkedIncomplete;
-use PHPUnit\Event\Test\MarkedIncompleteSubscriber;
-
-/**
- * @internal
- */
-final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber
-{
-    public function notify(MarkedIncomplete $event): void
-    {
-        $this->logger()->testMarkedIncomplete($event);
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php b/src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php
deleted file mode 100644
index f9841361..00000000
--- a/src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\Test\Prepared;
-use PHPUnit\Event\Test\PreparedSubscriber;
-
-/**
- * @internal
- */
-final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber
-{
-    public function notify(Prepared $event): void
-    {
-        $this->logger()->testPrepared($event);
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestRunnerExecutionFinishedSubscriber.php b/src/Logging/JUnit/Subscriber/TestRunnerExecutionFinishedSubscriber.php
deleted file mode 100644
index 8dcf762f..00000000
--- a/src/Logging/JUnit/Subscriber/TestRunnerExecutionFinishedSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\TestRunner\ExecutionFinished;
-use PHPUnit\Event\TestRunner\ExecutionFinishedSubscriber;
-
-/**
- * @internal
- */
-final class TestRunnerExecutionFinishedSubscriber extends Subscriber implements ExecutionFinishedSubscriber
-{
-    public function notify(ExecutionFinished $event): void
-    {
-        $this->logger()->flush();
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php b/src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php
deleted file mode 100644
index afa764ad..00000000
--- a/src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\Test\Skipped;
-use PHPUnit\Event\Test\SkippedSubscriber;
-
-/**
- * @internal
- */
-final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber
-{
-    public function notify(Skipped $event): void
-    {
-        $this->logger()->testSkipped($event);
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php b/src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php
deleted file mode 100644
index 9ed15c15..00000000
--- a/src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\TestSuite\Finished;
-use PHPUnit\Event\TestSuite\FinishedSubscriber;
-
-/**
- * @internal
- */
-final class TestSuiteFinishedSubscriber extends Subscriber implements FinishedSubscriber
-{
-    public function notify(Finished $event): void
-    {
-        $this->logger()->testSuiteFinished();
-    }
-}
diff --git a/src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php b/src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php
deleted file mode 100644
index 26f80239..00000000
--- a/src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging\JUnit\Subscriber;
-
-use PHPUnit\Event\TestSuite\Started;
-use PHPUnit\Event\TestSuite\StartedSubscriber;
-
-/**
- * @internal
- */
-final class TestSuiteStartedSubscriber extends Subscriber implements StartedSubscriber
-{
-    public function notify(Started $event): void
-    {
-        $this->logger()->testSuiteStarted($event);
-    }
-}
diff --git a/src/Plugins/JUnit.php b/src/Plugins/JUnit.php
deleted file mode 100644
index 3ee9bdf7..00000000
--- a/src/Plugins/JUnit.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Plugins;
-
-use Pest\Contracts\Plugins\HandlesArguments;
-use Pest\Plugins\Concerns\HandleArguments;
-
-/**
- * @internal
- */
-final class JUnit implements HandlesArguments
-{
-    use HandleArguments;
-
-    /**
-     * Handles the arguments, adding the cache directory and the cache result arguments.
-     */
-    public function handleArguments(array $arguments): array
-    {
-        if (! $this->hasArgument('--log-junit', $arguments)) {
-            return $arguments;
-        }
-
-        $logUnitArgument = null;
-
-        $arguments = array_filter($arguments, function (string $argument) use (&$logUnitArgument): bool {
-            if (str_starts_with($argument, '--log-junit')) {
-                $logUnitArgument = $argument;
-
-                return false;
-            }
-
-            return true;
-        });
-
-        assert(is_string($logUnitArgument));
-
-        $arguments[] = $logUnitArgument;
-
-        return array_values($arguments);
-    }
-}
diff --git a/src/Subscribers/EnsureJunitEnabled.php b/src/Subscribers/EnsureJunitEnabled.php
deleted file mode 100644
index b57c32e6..00000000
--- a/src/Subscribers/EnsureJunitEnabled.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Subscribers;
-
-use Pest\Logging\Converter;
-use Pest\Logging\JUnit\JUnitLogger;
-use Pest\Support\Container;
-use Pest\TestSuite;
-use PHPUnit\Event\TestRunner\Configured;
-use PHPUnit\Event\TestRunner\ConfiguredSubscriber;
-use PHPUnit\TextUI\Configuration\Configuration;
-use PHPUnit\TextUI\Output\DefaultPrinter;
-use Symfony\Component\Console\Input\InputInterface;
-
-/**
- * @internal
- */
-final class EnsureJunitEnabled implements ConfiguredSubscriber
-{
-    /**
-     * Creates a new Configured Subscriber instance.
-     */
-    public function __construct(
-        private readonly InputInterface $input,
-        private readonly TestSuite $testSuite,
-    ) {
-    }
-
-    /**
-     * Runs the subscriber.
-     */
-    public function notify(Configured $event): void
-    {
-        if (! $this->input->hasParameterOption('--log-junit')) {
-            return;
-        }
-
-        $configuration = Container::getInstance()->get(Configuration::class);
-        assert($configuration instanceof Configuration);
-
-        new JUnitLogger(
-            DefaultPrinter::from($configuration->logfileJunit()),
-            new Converter($this->testSuite->rootPath),
-        );
-    }
-}