diff --git a/tests/Phing/Input/ConsoleInputHandlerTest.php b/tests/Phing/Input/ConsoleInputHandlerTest.php
index b886f38fdf..f7c86bb3e6 100644
--- a/tests/Phing/Input/ConsoleInputHandlerTest.php
+++ b/tests/Phing/Input/ConsoleInputHandlerTest.php
@@ -27,10 +27,6 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Output\NullOutput;
 
-/**
- * @internal
- * @coversNothing
- */
 class ConsoleInputHandlerTest extends TestCase
 {
     public function testDefaultValue()
diff --git a/tests/Phing/Input/NoInteractionInputHandlerTest.php b/tests/Phing/Input/NoInteractionInputHandlerTest.php
index 68131c348d..63733d0fa3 100644
--- a/tests/Phing/Input/NoInteractionInputHandlerTest.php
+++ b/tests/Phing/Input/NoInteractionInputHandlerTest.php
@@ -28,10 +28,6 @@
 use Phing\Input\YesNoInputRequest;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class NoInteractionInputHandlerTest extends TestCase
 {
     public function testDefaultValue()
diff --git a/tests/Phing/Io/FileParserFactoryTest.php b/tests/Phing/Io/FileParserFactoryTest.php
index 452f795ca0..fbdcab35f5 100644
--- a/tests/Phing/Io/FileParserFactoryTest.php
+++ b/tests/Phing/Io/FileParserFactoryTest.php
@@ -23,13 +23,14 @@
 use Phing\Io\FileParserFactory;
 use Phing\Io\IniFileParser;
 use Phing\Io\YamlFileParser;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit test for FileParserFactory.
  *
  * @author Mike Lohmann <mike.lohmann@deck36.de>
  */
-class FileParserFactoryTest extends \PHPUnit\Framework\TestCase
+class FileParserFactoryTest extends TestCase
 {
     /**
      * @var FileParserFactory
@@ -58,7 +59,7 @@ public function tearDown(): void
     }
 
     /**
-     * @covers       \FileParserFactory::createParser
+     * @covers       FileParserFactory::createParser
      * @dataProvider parserTypeProvider
      *
      * @param mixed $parserName
diff --git a/tests/Phing/Io/IniFileParserTest.php b/tests/Phing/Io/IniFileParserTest.php
index 5df33b813a..3a4efa3432 100644
--- a/tests/Phing/Io/IniFileParserTest.php
+++ b/tests/Phing/Io/IniFileParserTest.php
@@ -20,6 +20,7 @@
 
 namespace Phing\Test\Io;
 
+use org\bovigo\vfs\vfsStream;
 use Phing\Io\File;
 use Phing\Io\IniFileParser;
 use Phing\Io\IOException;
@@ -36,13 +37,13 @@ class IniFileParserTest extends \PHPUnit\Framework\TestCase
     protected function setUp(): void
     {
         $this->parser = new IniFileParser();
-        $this->root = \org\bovigo\vfs\vfsStream::setUp();
+        $this->root = vfsStream::setUp();
     }
 
     /**
      * @dataProvider provideIniFiles
-     * @covers       \IniFileParser::inVal
-     * @covers       \IniFileParser::parseFile
+     * @covers       IniFileParser::inVal
+     * @covers       IniFileParser::parseFile
      *
      * @param mixed $data
      * @param mixed $expected
@@ -57,7 +58,7 @@ public function testParseFile($data, $expected)
     }
 
     /**
-     * @covers \IniFileParser::parseFile
+     * @covers IniFileParser::parseFile
      */
     public function testParseFileCouldntOpenFile()
     {
diff --git a/tests/Phing/Io/YamlFileParserTest.php b/tests/Phing/Io/YamlFileParserTest.php
index 0ff97ee09a..19bf02a952 100644
--- a/tests/Phing/Io/YamlFileParserTest.php
+++ b/tests/Phing/Io/YamlFileParserTest.php
@@ -55,8 +55,6 @@ public function setUp(): void
     {
         if (!class_exists('\Symfony\Component\Yaml\Parser')) {
             $this->markTestSkipped('Yaml parser is not installed.');
-
-            exit;
         }
         $this->yamlFileStub = PHING_TEST_BASE . '/etc/system/io/config.yml';
         $this->incorrectYamlFileStub = PHING_TEST_BASE . '/etc/system/io/config_wrong.yml';
@@ -72,7 +70,7 @@ public function tearDown(): void
     }
 
     /**
-     * @covers \IniFileParser::parseFile
+     * @covers IniFileParser::parseFile
      */
     public function testParseFileFileNotReadable()
     {
@@ -87,7 +85,7 @@ public function testParseFileFileNotReadable()
     }
 
     /**
-     * @covers \IniFileParser::parseFile
+     * @covers IniFileParser::parseFile
      */
     public function testParseFileFileIncorrectYaml()
     {
@@ -102,7 +100,7 @@ public function testParseFileFileIncorrectYaml()
      * The YamlFileParser has to provide a flattened array which then is
      * compatible to the actual behaviour of properties.
      *
-     * @covers \IniFileParser::parseFile
+     * @covers IniFileParser::parseFile
      */
     public function testParseFileFile()
     {
diff --git a/tests/Phing/Listener/DefaultLoggerTest.php b/tests/Phing/Listener/DefaultLoggerTest.php
index e32dc17a3f..6e5a2fce12 100644
--- a/tests/Phing/Listener/DefaultLoggerTest.php
+++ b/tests/Phing/Listener/DefaultLoggerTest.php
@@ -30,10 +30,6 @@
 use PHPUnit\Framework\TestCase;
 use Throwable;
 
-/**
- * @internal
- * @coversNothing
- */
 class DefaultLoggerTest extends TestCase
 {
     /**
diff --git a/tests/Phing/Listener/MonologListenerTest.php b/tests/Phing/Listener/MonologListenerTest.php
index e8df1278c6..abfe635221 100644
--- a/tests/Phing/Listener/MonologListenerTest.php
+++ b/tests/Phing/Listener/MonologListenerTest.php
@@ -25,10 +25,6 @@
 use Phing\Project;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class MonologListenerTest extends TestCase
 {
     /**
diff --git a/tests/Phing/Listener/SilentLoggerTest.php b/tests/Phing/Listener/SilentLoggerTest.php
index 86199cc6aa..3da9b7c624 100644
--- a/tests/Phing/Listener/SilentLoggerTest.php
+++ b/tests/Phing/Listener/SilentLoggerTest.php
@@ -27,10 +27,6 @@
 use Phing\Project;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class SilentLoggerTest extends TestCase
 {
     /**
diff --git a/tests/Phing/Listener/StatisticsListenerTest.php b/tests/Phing/Listener/StatisticsListenerTest.php
index 5d0f4cc743..1a6d43e1c7 100644
--- a/tests/Phing/Listener/StatisticsListenerTest.php
+++ b/tests/Phing/Listener/StatisticsListenerTest.php
@@ -25,10 +25,6 @@
 use Phing\Project;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class StatisticsListenerTest extends TestCase
 {
     /**
diff --git a/tests/Phing/Listener/TimestampedLoggerTest.php b/tests/Phing/Listener/TimestampedLoggerTest.php
index f4714a3ff4..3eeb59cd6d 100644
--- a/tests/Phing/Listener/TimestampedLoggerTest.php
+++ b/tests/Phing/Listener/TimestampedLoggerTest.php
@@ -26,10 +26,6 @@
 use Phing\Project;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class TimestampedLoggerTest extends TestCase
 {
     /**
diff --git a/tests/Phing/PropertyHelperTest.php b/tests/Phing/PropertyHelperTest.php
index 8fb0ce0ad2..8154040ec0 100644
--- a/tests/Phing/PropertyHelperTest.php
+++ b/tests/Phing/PropertyHelperTest.php
@@ -24,10 +24,6 @@
 use Phing\PropertyHelper;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class PropertyHelperTest extends TestCase
 {
     public function testUndefinedPropertyShouldNotBeReplaced()
diff --git a/tests/Phing/Task/Optional/ArgTest.php b/tests/Phing/Task/Optional/ArgTest.php
index 1c30a0394a..1829d6ebf1 100644
--- a/tests/Phing/Task/Optional/ArgTest.php
+++ b/tests/Phing/Task/Optional/ArgTest.php
@@ -21,12 +21,14 @@
 namespace Phing\Test\Task\Optional;
 
 use Phing\Task\Optional\SymfonyConsoleArg;
+use Phing\Task\OptionalSymfonyConsoleArg;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test class for Arg.
  * Generated by PHPUnit on 2012-02-13 at 12:02:17.
  */
-class ArgTest extends \PHPUnit\Framework\TestCase
+class ArgTest extends TestCase
 {
     /**
      * @var SymfonyConsoleArg
@@ -51,8 +53,8 @@ protected function tearDown(): void
     }
 
     /**
-     * @covers \SymfonyConsoleArg::getName
-     * @covers \SymfonyConsoleArg::setName
+     * @covers SymfonyConsoleArg::getName
+     * @covers SymfonyConsoleArg::setName
      */
     public function testSetGetName()
     {
@@ -62,8 +64,8 @@ public function testSetGetName()
     }
 
     /**
-     * @covers \SymfonyConsoleArg::getValue
-     * @covers \SymfonyConsoleArg::setValue
+     * @covers SymfonyConsoleArg::getValue
+     * @covers SymfonyConsoleArg::setValue
      */
     public function testSetGetValue()
     {
@@ -73,8 +75,8 @@ public function testSetGetValue()
     }
 
     /**
-     * @covers \SymfonyConsoleArg::getQuotes
-     * @covers \SymfonyConsoleArg::setQuotes
+     * @covers SymfonyConsoleArg::getQuotes
+     * @covers SymfonyConsoleArg::setQuotes
      */
     public function testGetQuotes()
     {
@@ -84,7 +86,7 @@ public function testGetQuotes()
     }
 
     /**
-     * @covers \SymfonyConsoleArg::__toString
+     * @covers SymfonyConsoleArg::__toString
      */
     public function testToStringWithQuotes()
     {
@@ -97,7 +99,7 @@ public function testToStringWithQuotes()
     }
 
     /**
-     * @covers \SymfonyConsoleArg::__toString
+     * @covers SymfonyConsoleArg::__toString
      */
     public function testToStringWithoutQuotes()
     {
@@ -110,7 +112,7 @@ public function testToStringWithoutQuotes()
     }
 
     /**
-     * @covers \SymfonyConsoleArg::__toString
+     * @covers SymfonyConsoleArg::__toString
      */
     public function testToStringJustName()
     {
@@ -122,7 +124,7 @@ public function testToStringJustName()
     }
 
     /**
-     * @covers \SymfonyConsoleArg::__toString
+     * @covers SymfonyConsoleArg::__toString
      */
     public function testToStringJustValueWithoutQuotes()
     {
@@ -134,7 +136,7 @@ public function testToStringJustValueWithoutQuotes()
     }
 
     /**
-     * @covers \SymfonyConsoleArg::__toString
+     * @covers SymfonyConsoleArg::__toString
      */
     public function testToStringJustValueWithQuotes()
     {
diff --git a/tests/Phing/Task/Optional/ComposerTaskTest.php b/tests/Phing/Task/Optional/ComposerTaskTest.php
index e4889bb528..ca81746fe9 100644
--- a/tests/Phing/Task/Optional/ComposerTaskTest.php
+++ b/tests/Phing/Task/Optional/ComposerTaskTest.php
@@ -23,7 +23,9 @@
 use Phing\Io\FileSystem;
 use Phing\Project;
 use Phing\Task\Optional\ComposerTask;
+use Phing\Task\OptionalComposerTask;
 use Phing\Type\CommandlineArgument;
+use PHPUnit\Framework\TestCase;
 use ReflectionMethod;
 use ReflectionProperty;
 
@@ -32,7 +34,7 @@
  *
  * @author  Nuno Costa <nuno@francodacosta.com>
  */
-class ComposerTaskTest extends \PHPUnit\Framework\TestCase
+class ComposerTaskTest extends TestCase
 {
     /**
      * @var ComposerTask
@@ -58,8 +60,8 @@ protected function tearDown(): void
     }
 
     /**
-     * @covers \ComposerTask::getCommand
-     * @covers \ComposerTask::setCommand
+     * @covers ComposerTask::getCommand
+     * @covers ComposerTask::setCommand
      */
     public function testSetGetCommand()
     {
@@ -69,8 +71,8 @@ public function testSetGetCommand()
     }
 
     /**
-     * @covers \ComposerTask::getPhp
-     * @covers \ComposerTask::setPhp
+     * @covers ComposerTask::getPhp
+     * @covers ComposerTask::setPhp
      */
     public function testSetGetPhp()
     {
@@ -80,7 +82,7 @@ public function testSetGetPhp()
     }
 
     /**
-     * @covers \ComposerTask::setComposer
+     * @covers ComposerTask::setComposer
      */
     public function testSetComposer()
     {
@@ -95,7 +97,7 @@ public function testSetComposer()
     }
 
     /**
-     * @covers \ComposerTask::getComposer
+     * @covers ComposerTask::getComposer
      */
     public function testGetComposerNotOnPath()
     {
@@ -118,7 +120,7 @@ public function testGetComposerNotOnPath()
     }
 
     /**
-     * @covers \ComposerTask::getComposer
+     * @covers ComposerTask::getComposer
      */
     public function testGetComposerFromPath()
     {
@@ -141,7 +143,7 @@ public function testGetComposerFromPath()
     }
 
     /**
-     * @covers \ComposerTask::createArg
+     * @covers ComposerTask::createArg
      */
     public function testCreateArg()
     {
diff --git a/tests/Phing/Task/Optional/IniFileTaskTest.php b/tests/Phing/Task/Optional/IniFileTaskTest.php
index 999a704bbd..94245b14b7 100644
--- a/tests/Phing/Task/Optional/IniFileTaskTest.php
+++ b/tests/Phing/Task/Optional/IniFileTaskTest.php
@@ -24,10 +24,6 @@
 use Phing\Project;
 use Phing\Test\Support\BuildFileTest;
 
-/**
- * @internal
- * @coversNothing
- */
 class IniFileTaskTest extends BuildFileTest
 {
     /**
diff --git a/tests/Phing/Task/Optional/PHPStan/PHPStanAnalyseCommandBuilderTest.php b/tests/Phing/Task/Optional/PHPStan/PHPStanAnalyseCommandBuilderTest.php
index 06a7cf8cbe..1a2c2dc432 100644
--- a/tests/Phing/Task/Optional/PHPStan/PHPStanAnalyseCommandBuilderTest.php
+++ b/tests/Phing/Task/Optional/PHPStan/PHPStanAnalyseCommandBuilderTest.php
@@ -26,10 +26,6 @@
 use Phing\Task\Ext\Phpstan\PHPStanTask;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class PHPStanAnalyseCommandBuilderTest extends TestCase
 {
     /** @var PHPStanAnalyseCommandBuilder */
diff --git a/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderFactoryTest.php b/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderFactoryTest.php
index 0445f32384..bc7c7aaaf5 100644
--- a/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderFactoryTest.php
+++ b/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderFactoryTest.php
@@ -30,10 +30,6 @@
 use Phing\Task\Ext\Phpstan\PHPStanTask;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class PHPStanCommandBuilderFactoryTest extends TestCase
 {
     /** @var PHPStanCommandBuilderFactory */
diff --git a/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderTest.php b/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderTest.php
index e202fb2923..9d55b078d2 100644
--- a/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderTest.php
+++ b/tests/Phing/Task/Optional/PHPStan/PHPStanCommandBuilderTest.php
@@ -26,10 +26,6 @@
 use Phing\Task\Ext\Phpstan\PHPStanTask;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class PHPStanCommandBuilderTest extends TestCase
 {
     /** @var PHPStanCommandBuilderFake */
diff --git a/tests/Phing/Task/Optional/PHPStan/PHPStanHelpCommandBuilderTest.php b/tests/Phing/Task/Optional/PHPStan/PHPStanHelpCommandBuilderTest.php
index 99be1e4650..f29fb40cab 100644
--- a/tests/Phing/Task/Optional/PHPStan/PHPStanHelpCommandBuilderTest.php
+++ b/tests/Phing/Task/Optional/PHPStan/PHPStanHelpCommandBuilderTest.php
@@ -26,10 +26,6 @@
 use Phing\Task\Ext\Phpstan\PHPStanTask;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class PHPStanHelpCommandBuilderTest extends TestCase
 {
     /** @var PHPStanHelpCommandBuilder */
diff --git a/tests/Phing/Task/Optional/PHPStan/PHPStanListCommandBuilderTest.php b/tests/Phing/Task/Optional/PHPStan/PHPStanListCommandBuilderTest.php
index 5f77d9bf34..9312b4b924 100644
--- a/tests/Phing/Task/Optional/PHPStan/PHPStanListCommandBuilderTest.php
+++ b/tests/Phing/Task/Optional/PHPStan/PHPStanListCommandBuilderTest.php
@@ -26,10 +26,6 @@
 use Phing\Task\Ext\Phpstan\PHPStanTask;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class PHPStanListCommandBuilderTest extends TestCase
 {
     /** @var PHPStanListCommandBuilder */
diff --git a/tests/Phing/Task/Optional/PHPStan/PHPStanTaskTest.php b/tests/Phing/Task/Optional/PHPStan/PHPStanTaskTest.php
index 8caf53e21f..3a4696a370 100644
--- a/tests/Phing/Task/Optional/PHPStan/PHPStanTaskTest.php
+++ b/tests/Phing/Task/Optional/PHPStan/PHPStanTaskTest.php
@@ -26,10 +26,6 @@
 use Phing\Project;
 use Phing\Test\Support\BuildFileTest;
 
-/**
- * @internal
- * @coversNothing
- */
 class PHPStanTaskTest extends BuildFileTest
 {
     private const PHPSTAN_TEST_BASE = PHING_TEST_BASE . '/etc/tasks/ext/phpstan/';
diff --git a/tests/Phing/Task/Optional/PHPStan/PHPStanTaskUnitTest.php b/tests/Phing/Task/Optional/PHPStan/PHPStanTaskUnitTest.php
index 30a4136d41..49168c4656 100644
--- a/tests/Phing/Task/Optional/PHPStan/PHPStanTaskUnitTest.php
+++ b/tests/Phing/Task/Optional/PHPStan/PHPStanTaskUnitTest.php
@@ -25,10 +25,6 @@
 use Phing\Task\Ext\Phpstan\PHPStanTask;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class PHPStanTaskUnitTest extends TestCase
 {
     public function testItHasValidDefaults(): void
diff --git a/tests/Phing/Task/Optional/Sass/SassCompilerTest.php b/tests/Phing/Task/Optional/Sass/SassCompilerTest.php
index c4e6548680..c94feea776 100644
--- a/tests/Phing/Task/Optional/Sass/SassCompilerTest.php
+++ b/tests/Phing/Task/Optional/Sass/SassCompilerTest.php
@@ -27,10 +27,6 @@
 use Phing\Task\Ext\SassCompiler;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class SassCompilerTest extends TestCase
 {
     use SassCleaner;
diff --git a/tests/Phing/Task/Optional/Sass/SassTaskAcceptanceTest.php b/tests/Phing/Task/Optional/Sass/SassTaskAcceptanceTest.php
index 1e5f9acc4b..bdc62ef38a 100644
--- a/tests/Phing/Task/Optional/Sass/SassTaskAcceptanceTest.php
+++ b/tests/Phing/Task/Optional/Sass/SassTaskAcceptanceTest.php
@@ -25,10 +25,6 @@
 use Phing\Project;
 use Phing\Test\Support\BuildFileTest;
 
-/**
- * @internal
- * @coversNothing
- */
 class SassTaskAcceptanceTest extends BuildFileTest
 {
     use SassCleaner;
diff --git a/tests/Phing/Task/Optional/Sass/SassTaskCompilerFactoryTest.php b/tests/Phing/Task/Optional/Sass/SassTaskCompilerFactoryTest.php
index ddbc205a0f..23524f2088 100644
--- a/tests/Phing/Task/Optional/Sass/SassTaskCompilerFactoryTest.php
+++ b/tests/Phing/Task/Optional/Sass/SassTaskCompilerFactoryTest.php
@@ -28,10 +28,6 @@
 use Phing\Task\Ext\SassTaskCompilerFactory;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class SassTaskCompilerFactoryTest extends TestCase
 {
     public function testItFailsWhenNoCompilerIsSet(): void
diff --git a/tests/Phing/Task/Optional/Sass/SassTaskUnitTest.php b/tests/Phing/Task/Optional/Sass/SassTaskUnitTest.php
index da26ee5438..fe55c77784 100644
--- a/tests/Phing/Task/Optional/Sass/SassTaskUnitTest.php
+++ b/tests/Phing/Task/Optional/Sass/SassTaskUnitTest.php
@@ -25,10 +25,6 @@
 use Phing\Task\Ext\SassTask;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class SassTaskUnitTest extends TestCase
 {
     /** @var SassTask */
diff --git a/tests/Phing/Task/Optional/Sass/ScssPhpCompilerTest.php b/tests/Phing/Task/Optional/Sass/ScssPhpCompilerTest.php
index 95f435bac0..ab1f5cbf32 100644
--- a/tests/Phing/Task/Optional/Sass/ScssPhpCompilerTest.php
+++ b/tests/Phing/Task/Optional/Sass/ScssPhpCompilerTest.php
@@ -27,10 +27,6 @@
 use Phing\Task\Ext\ScssPhpCompiler;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class ScssPhpCompilerTest extends TestCase
 {
     private const SASS_TEST_BASE = PHING_TEST_BASE . '/etc/tasks/ext/sass/';
diff --git a/tests/Phing/Task/Optional/SymfonyConsoleTest.php b/tests/Phing/Task/Optional/SymfonyConsoleTest.php
index b364a96e6e..f2b3e55c99 100644
--- a/tests/Phing/Task/Optional/SymfonyConsoleTest.php
+++ b/tests/Phing/Task/Optional/SymfonyConsoleTest.php
@@ -53,8 +53,8 @@ protected function tearDown(): void
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getCommand
-     * @covers \SymfonyConsoleTask::setCommand
+     * @covers SymfonyConsoleTask::getCommand
+     * @covers SymfonyConsoleTask::setCommand
      */
     public function testSetGetCommand()
     {
@@ -64,8 +64,8 @@ public function testSetGetCommand()
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getConsole
-     * @covers \SymfonyConsoleTask::setConsole
+     * @covers SymfonyConsoleTask::getConsole
+     * @covers SymfonyConsoleTask::setConsole
      */
     public function testSetGetConsole()
     {
@@ -75,8 +75,8 @@ public function testSetGetConsole()
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getDebug
-     * @covers \SymfonyConsoleTask::setDebug
+     * @covers SymfonyConsoleTask::getDebug
+     * @covers SymfonyConsoleTask::setDebug
      */
     public function testSetGetDebug()
     {
@@ -86,8 +86,8 @@ public function testSetGetDebug()
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getSilent
-     * @covers \SymfonyConsoleTask::setSilent
+     * @covers SymfonyConsoleTask::getSilent
+     * @covers SymfonyConsoleTask::setSilent
      */
     public function testSetGetSilent()
     {
@@ -97,7 +97,7 @@ public function testSetGetSilent()
     }
 
     /**
-     * @covers \SymfonyConsoleTask::createArg
+     * @covers SymfonyConsoleTask::createArg
      */
     public function testCreateArg()
     {
@@ -107,19 +107,19 @@ public function testCreateArg()
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getArgs
+     * @covers SymfonyConsoleTask::getArgs
      */
     public function testGetArgs()
     {
         $o = $this->object;
-        $arg = $o->createArg();
-        $arg = $o->createArg();
-        $arg = $o->createArg();
+        $o->createArg();
+        $o->createArg();
+        $o->createArg();
         $this->assertCount(3, $o->getArgs());
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getCmdString
+     * @covers SymfonyConsoleTask::getCmdString
      *
      * @todo Implement testMain().
      */
@@ -139,7 +139,7 @@ public function testGetCmdString()
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getCmdString
+     * @covers SymfonyConsoleTask::getCmdString
      */
     public function testNoDebugGetCmdString()
     {
@@ -158,7 +158,7 @@ public function testNoDebugGetCmdString()
     }
 
     /**
-     * @covers \SymfonyConsoleTask::getCmdString
+     * @covers SymfonyConsoleTask::getCmdString
      */
     public function testNoDebugOnlyOnce()
     {
diff --git a/tests/Phing/Task/System/TaskdefTaskTest.php b/tests/Phing/Task/System/TaskdefTaskTest.php
index 2ada1be2b0..2d63526ce2 100644
--- a/tests/Phing/Task/System/TaskdefTaskTest.php
+++ b/tests/Phing/Task/System/TaskdefTaskTest.php
@@ -25,10 +25,6 @@
 use Phing\Test\Support\BuildFileTest;
 use Phing\Test\Support\TaskdefTestSimpleTask;
 
-/**
- * @internal
- * @coversNothing
- */
 class TaskdefTaskTest extends BuildFileTest
 {
     public function setUp(): void
diff --git a/tests/Phing/Type/ExcludesNameEntryTest.php b/tests/Phing/Type/ExcludesNameEntryTest.php
index 808cc213bc..e0eaee88e2 100644
--- a/tests/Phing/Type/ExcludesNameEntryTest.php
+++ b/tests/Phing/Type/ExcludesNameEntryTest.php
@@ -23,10 +23,6 @@
 use Phing\Type\ExcludesNameEntry;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class ExcludesNameEntryTest extends TestCase
 {
     /**
diff --git a/tests/Phing/Type/FileListTest.php b/tests/Phing/Type/FileListTest.php
index c2880c2528..ae703b4f98 100644
--- a/tests/Phing/Type/FileListTest.php
+++ b/tests/Phing/Type/FileListTest.php
@@ -27,10 +27,6 @@
 use Phing\Type\Reference;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class FileListTest extends TestCase
 {
     /**
diff --git a/tests/Phing/Type/TaskdefForCopyTest.php b/tests/Phing/Type/TaskdefForCopyTest.php
index 94286cb351..9f4cd27563 100644
--- a/tests/Phing/Type/TaskdefForCopyTest.php
+++ b/tests/Phing/Type/TaskdefForCopyTest.php
@@ -22,10 +22,6 @@
 
 use Phing\Test\Support\BuildFileTest;
 
-/**
- * @internal
- * @coversNothing
- */
 class TaskdefForCopyTest extends BuildFileTest
 {
     public function setUp(): void
diff --git a/tests/Phing/Util/SizeHelperTest.php b/tests/Phing/Util/SizeHelperTest.php
index cbd956dc08..2abf30ad59 100644
--- a/tests/Phing/Util/SizeHelperTest.php
+++ b/tests/Phing/Util/SizeHelperTest.php
@@ -24,10 +24,6 @@
 use Phing\Util\SizeHelper;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @internal
- * @coversNothing
- */
 class SizeHelperTest extends TestCase
 {
     /**