diff --git a/tests/Issues/TemplatedTypeOnParamAndReturn/Fixture/skip_templated_type_on_param_and_return.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/Fixture/skip_templated_type_on_param_and_return.php.inc
similarity index 80%
rename from tests/Issues/TemplatedTypeOnParamAndReturn/Fixture/skip_templated_type_on_param_and_return.php.inc
rename to rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/Fixture/skip_templated_type_on_param_and_return.php.inc
index 6d87ea91fe9..426f2df63df 100644
--- a/tests/Issues/TemplatedTypeOnParamAndReturn/Fixture/skip_templated_type_on_param_and_return.php.inc
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/Fixture/skip_templated_type_on_param_and_return.php.inc
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Issues\TemplatedTypeOnParamAndReturn\Fixture;
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
 
 abstract class Model {}
 interface EventInterface {}
diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/Fixture/skip_templated_type_on_param_and_return.php.inc b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/Fixture/skip_templated_type_on_param_and_return.php.inc
new file mode 100644
index 00000000000..c74dab53a43
--- /dev/null
+++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/Fixture/skip_templated_type_on_param_and_return.php.inc
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector\Fixture;
+
+abstract class Model {}
+interface EventInterface {}
+
+/** @template TModel of Model */
+abstract class SkipTemplatedTypeOnParamAndReturn
+{
+    /**
+     * @param TModel&EventInterface $model
+     * @return TModel&EventInterface
+     */
+    abstract public function run(Model&EventInterface $model): Model&EventInterface;
+}
diff --git a/tests/Issues/TemplatedTypeOnParamAndReturn/TemplatedTypeOnParamAndReturnTest.php b/tests/Issues/TemplatedTypeOnParamAndReturn/TemplatedTypeOnParamAndReturnTest.php
deleted file mode 100644
index f2230cfdd2f..00000000000
--- a/tests/Issues/TemplatedTypeOnParamAndReturn/TemplatedTypeOnParamAndReturnTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Tests\Issues\TemplatedTypeOnParamAndReturn;
-
-use Iterator;
-use PHPUnit\Framework\Attributes\DataProvider;
-use Rector\Testing\PHPUnit\AbstractRectorTestCase;
-
-final class TemplatedTypeOnParamAndReturnTest extends AbstractRectorTestCase
-{
-    #[DataProvider('provideData')]
-    public function test(string $filePath): void
-    {
-        $this->doTestFile($filePath);
-    }
-
-    public static function provideData(): Iterator
-    {
-        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
-    }
-
-    public function provideConfigFilePath(): string
-    {
-        return __DIR__ . '/config/configured_rule.php';
-    }
-}
diff --git a/tests/Issues/TemplatedTypeOnParamAndReturn/config/configured_rule.php b/tests/Issues/TemplatedTypeOnParamAndReturn/config/configured_rule.php
deleted file mode 100644
index 3cb97cdb0d6..00000000000
--- a/tests/Issues/TemplatedTypeOnParamAndReturn/config/configured_rule.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Rector\Config\RectorConfig;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
-
-return RectorConfig::configure()
-    ->withRules([RemoveUselessParamTagRector::class, RemoveUselessReturnTagRector::class]);