diff --git a/tests/Issues/Issue2863/Fixture/fixture2863_keep_comment.php.inc b/tests/Issues/Issue2863/Fixture/fixture2863_keep_comment.php.inc
deleted file mode 100644
index fe2bbbd2db6..00000000000
--- a/tests/Issues/Issue2863/Fixture/fixture2863_keep_comment.php.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Rector\Core\Tests\Issues\Issue2863\Fixture;
-
-class Fixture2863KeepComment
-{
-    public function foo($foo)
-    {
-        //thiscommentshouldnotberemoved
-        return $foo;
-    }
-}
diff --git a/tests/Issues/Issue2863/Fixture/fixture2863_keep_space.php.inc b/tests/Issues/Issue2863/Fixture/fixture2863_keep_space.php.inc
deleted file mode 100644
index 19f772ff46d..00000000000
--- a/tests/Issues/Issue2863/Fixture/fixture2863_keep_space.php.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Rector\Core\Tests\Issues\Issue2863\Fixture;
-
-class Fixture2863KeepSpace
-{
-    public function bar($bar)
-    {
-        // @var string $bar['should_not_be_changed]
-
-        return $bar['should_not_be_changed'];
-    }
-}
diff --git a/tests/Issues/Issue2863/config2863.yaml b/tests/Issues/Issue2863/config2863.yaml
deleted file mode 100644
index 1a605f1f522..00000000000
--- a/tests/Issues/Issue2863/config2863.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
-    sets:
-        - "dead-code"
diff --git a/tests/Issues/Issue3222/Fixture/fixture3222.php.inc b/tests/Issues/Issue3222/Fixture/fixture3222.php.inc
deleted file mode 100644
index 735f38985a4..00000000000
--- a/tests/Issues/Issue3222/Fixture/fixture3222.php.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Rector\Core\Tests\Issues\Issue3222\Fixture;
-
-/**
- * This docblock is being deleted when there's an empty docblock after it.
- */
-
-/**
- *
- */
-
-final class Fixture3222
-{
-    private $eventDispatcher;
-
-    public function __construct(EventDispatcher $eventDispatcher)
-    {
-        $this->eventDispatcher = $eventDispatcher;
-    }
-}
-
-?>
------
-<?php
-
-namespace Rector\Core\Tests\Issues\Issue3222\Fixture;
-
-/**
- * This docblock is being deleted when there's an empty docblock after it.
- */
-
-/**
- *
- */
-
-final class Fixture3222
-{
-    private \Rector\Core\Tests\Issues\Issue3222\Fixture\EventDispatcher $eventDispatcher;
-
-    public function __construct(EventDispatcher $eventDispatcher)
-    {
-        $this->eventDispatcher = $eventDispatcher;
-    }
-}
-
-?>
diff --git a/tests/Issues/Issue3222/Fixture/fixture3222_with_many_comments.php.inc b/tests/Issues/Issue3222/Fixture/fixture3222_with_many_comments.php.inc
deleted file mode 100644
index 49d68f6eebb..00000000000
--- a/tests/Issues/Issue3222/Fixture/fixture3222_with_many_comments.php.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Rector\Core\Tests\Issues\Issue3222\Fixture;
-
-/**
- * The empty line after this docblock is being deleted.
- */
-
-/**
- * Another dockblock.
- *
- *
- * first_function()
- *
- *
- * second_function()
- * third_function()
- * fourth_function()
- */
-
-final class Fixture3222WithManyComments
-{
-    private $eventDispatcher;
-
-    public function __construct(EventDispatcher $eventDispatcher)
-    {
-        $this->eventDispatcher = $eventDispatcher;
-    }
-}
-
-?>
------
-<?php
-
-namespace Rector\Core\Tests\Issues\Issue3222\Fixture;
-
-/**
- * The empty line after this docblock is being deleted.
- */
-
-/**
- * Another dockblock.
- *
- *
- * first_function()
- *
- *
- * second_function()
- * third_function()
- * fourth_function()
- */
-
-final class Fixture3222WithManyComments
-{
-    private \Rector\Core\Tests\Issues\Issue3222\Fixture\EventDispatcher $eventDispatcher;
-
-    public function __construct(EventDispatcher $eventDispatcher)
-    {
-        $this->eventDispatcher = $eventDispatcher;
-    }
-}
-
-?>
diff --git a/tests/Issues/Issue3222/Issue3222Test.php b/tests/Issues/Issue3222/Issue3222Test.php
deleted file mode 100644
index e0f80751015..00000000000
--- a/tests/Issues/Issue3222/Issue3222Test.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Core\Tests\Issues\Issue3222;
-
-use Iterator;
-use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
-use Symplify\SmartFileSystem\SmartFileInfo;
-
-final class Issue3222Test extends AbstractRectorTestCase
-{
-    /**
-     * @dataProvider provideData()
-     */
-    public function test(SmartFileInfo $fileInfo): void
-    {
-        $this->doTestFileInfo($fileInfo);
-    }
-
-    public function provideData(): Iterator
-    {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
-    }
-
-    protected function provideConfig(): string
-    {
-        return __DIR__ . '/config3222.yaml';
-    }
-}
diff --git a/tests/Issues/Issue3222/config3222.yaml b/tests/Issues/Issue3222/config3222.yaml
deleted file mode 100644
index c3ce0f278c8..00000000000
--- a/tests/Issues/Issue3222/config3222.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-services:
-    Rector\Php74\Rector\Property\TypedPropertyRector: null
diff --git a/tests/Issues/Issue2863/Issue2863Test.php b/tests/PhpParser/Printer/CommentPreserving/CommentPreservingTest.php
similarity index 62%
rename from tests/Issues/Issue2863/Issue2863Test.php
rename to tests/PhpParser/Printer/CommentPreserving/CommentPreservingTest.php
index 6f9ac11d6ca..f489bf8072a 100644
--- a/tests/Issues/Issue2863/Issue2863Test.php
+++ b/tests/PhpParser/Printer/CommentPreserving/CommentPreservingTest.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\Tests\Issues\Issue2863;
+namespace Rector\Core\Tests\PhpParser\Printer\CommentPreserving;
 
 use Iterator;
 use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Php74\Rector\Property\TypedPropertyRector;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class Issue2863Test extends AbstractRectorTestCase
+final class CommentPreservingTest extends AbstractRectorTestCase
 {
     /**
      * @dataProvider provideData()
@@ -23,8 +24,8 @@ final class Issue2863Test extends AbstractRectorTestCase
         return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
-    protected function provideConfig(): string
+    protected function getRectorClass(): string
     {
-        return __DIR__ . '/config2863.yaml';
+        return TypedPropertyRector::class;
     }
 }
diff --git a/tests/PhpParser/Printer/CommentPreserving/Fixture/comments_for_typed_property.php.inc b/tests/PhpParser/Printer/CommentPreserving/Fixture/comments_for_typed_property.php.inc
new file mode 100644
index 00000000000..edf1be4d3e6
--- /dev/null
+++ b/tests/PhpParser/Printer/CommentPreserving/Fixture/comments_for_typed_property.php.inc
@@ -0,0 +1,75 @@
+<?php
+
+namespace Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Fixture;
+
+use Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Source\LocalEventDispatcher;
+
+/**
+ * This docblock is being deleted when there's an empty docblock after it.
+ */
+
+/**
+ *
+ */
+
+/**
+ * Another dockblock.
+ *
+ *
+ * first_function()
+ *
+ *
+ * second_function()
+ * third_function()
+ * fourth_function()
+ */
+
+final class CommentsForTypedProperty
+{
+    private $eventDispatcher;
+
+    public function __construct(LocalEventDispatcher $eventDispatcher)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Fixture;
+
+use Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Source\LocalEventDispatcher;
+
+/**
+ * This docblock is being deleted when there's an empty docblock after it.
+ */
+
+/**
+ *
+ */
+
+/**
+ * Another dockblock.
+ *
+ *
+ * first_function()
+ *
+ *
+ * second_function()
+ * third_function()
+ * fourth_function()
+ */
+
+final class CommentsForTypedProperty
+{
+    private \Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Source\LocalEventDispatcher $eventDispatcher;
+
+    public function __construct(LocalEventDispatcher $eventDispatcher)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+    }
+}
+
+?>
diff --git a/tests/PhpParser/Printer/CommentPreserving/Fixture/keep_comment.php.inc b/tests/PhpParser/Printer/CommentPreserving/Fixture/keep_comment.php.inc
new file mode 100644
index 00000000000..53bf4e91c07
--- /dev/null
+++ b/tests/PhpParser/Printer/CommentPreserving/Fixture/keep_comment.php.inc
@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Fixture;
+
+class KeepComment
+{
+    public function foo($foo)
+    {
+        //thiscommentshouldnotberemoved
+        return $foo;
+    }
+
+    public function bar($bar)
+    {
+        // @var string $bar['should_not_be_changed]
+
+        return $bar['should_not_be_changed'];
+    }
+}
diff --git a/tests/Issues/Issue2863/Fixture/fixture2863_keep_double_comments.php.inc b/tests/PhpParser/Printer/CommentPreserving/Fixture/keep_double_comments.php.inc
similarity index 72%
rename from tests/Issues/Issue2863/Fixture/fixture2863_keep_double_comments.php.inc
rename to tests/PhpParser/Printer/CommentPreserving/Fixture/keep_double_comments.php.inc
index 9cd5e426668..66dda565ddf 100644
--- a/tests/Issues/Issue2863/Fixture/fixture2863_keep_double_comments.php.inc
+++ b/tests/PhpParser/Printer/CommentPreserving/Fixture/keep_double_comments.php.inc
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Core\Tests\Issues\Issue2863\Fixture;
+namespace Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Fixture;
 
-class Fixture2863KeepDoubleComments
+class KeepDoubleComments
 {
     /*****************************************
      * should not be removed
diff --git a/tests/Issues/Issue2863/Fixture/fixture2863_keep_multiline_single_asterisk.php.inc b/tests/PhpParser/Printer/CommentPreserving/Fixture/keep_multiline_single_asterisk.php.inc
similarity index 57%
rename from tests/Issues/Issue2863/Fixture/fixture2863_keep_multiline_single_asterisk.php.inc
rename to tests/PhpParser/Printer/CommentPreserving/Fixture/keep_multiline_single_asterisk.php.inc
index 89ff6b118be..e7b8329a3d7 100644
--- a/tests/Issues/Issue2863/Fixture/fixture2863_keep_multiline_single_asterisk.php.inc
+++ b/tests/PhpParser/Printer/CommentPreserving/Fixture/keep_multiline_single_asterisk.php.inc
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Core\Tests\Issues\Issue2863\Fixture;
+namespace Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Fixture;
 
-class Fixture2863KeepMultilineSingleAsterisk
+class KeepMultilineSingleAsterisk
 {
     public function baz($baz)
     {
diff --git a/tests/PhpParser/Printer/CommentPreserving/Source/LocalEventDispatcher.php b/tests/PhpParser/Printer/CommentPreserving/Source/LocalEventDispatcher.php
new file mode 100644
index 00000000000..99b3654d91f
--- /dev/null
+++ b/tests/PhpParser/Printer/CommentPreserving/Source/LocalEventDispatcher.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\PhpParser\Printer\CommentPreserving\Source;
+
+final class LocalEventDispatcher
+{
+
+}