diff --git a/packages/PHPUnit/src/Rector/ArrayToYieldDataProviderRector.php b/packages/PHPUnit/src/Rector/ArrayToYieldDataProviderRector.php
index b75cbb127ca..2efb2145eb9 100644
--- a/packages/PHPUnit/src/Rector/ArrayToYieldDataProviderRector.php
+++ b/packages/PHPUnit/src/Rector/ArrayToYieldDataProviderRector.php
@@ -11,7 +11,6 @@ use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
-use Rector\Node\Attribute;
 use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockAnalyzer;
 use Rector\Rector\AbstractPHPUnitRector;
 use Rector\RectorDefinition\CodeSample;
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct.php.inc
new file mode 100644
index 00000000000..881ef53b257
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct.php.inc
@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector;
+
+use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source\SomeChildOfValueObject;
+
+class ActionClass
+{
+    /**
+     * @var string|null
+     */
+    private $someChildValueObject;
+
+    public function someFunction()
+    {
+        $this->someChildValueObject = new SomeChildOfValueObject('value');
+
+        $someChildValueObject = new SomeChildOfValueObject();
+    }
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct2.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct2.php.inc
new file mode 100644
index 00000000000..f063f11b613
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct2.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace SomeNamespace;
+
+use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
+
+class FourthActionClass
+{
+    public function someFunction(?SomeValueObject $name): ?SomeValueObject
+    {
+        /** @var string|null $someValueObject */
+        $someValueObject = new SomeValueObject('value');
+    }
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct3.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct3.php.inc
new file mode 100644
index 00000000000..7c4c905896e
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Correct/correct3.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace SomeNamespace;
+
+use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
+
+class ThirdActionClass
+{
+    /**
+     * @param null|string $name
+     */
+    public function someFunction(?SomeValueObject $name): ?SomeValueObject
+    {
+    }
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Source/SomeChildOfValueObject.php b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Source/SomeChildOfValueObject.php
new file mode 100644
index 00000000000..681a939ba28
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Source/SomeChildOfValueObject.php
@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source;
+
+class SomeChildOfValueObject extends SomeValueObject
+{
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php
new file mode 100644
index 00000000000..e636d34b24a
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source;
+
+class SomeValueObject
+{
+
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php
new file mode 100644
index 00000000000..c041765da9c
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+/**
+ * @covers \Rector\Rector\DomainDrivenDesign\ValueObjectRemover\ValueObjectRemoverDocBlockRector
+ */
+final class ValueObjectRemoverDocBlockRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideWrongToFixedFiles()
+     */
+    public function test(string $wrong, string $fixed): void
+    {
+        $this->doTestFileMatchesExpectedContent($wrong, $fixed);
+    }
+
+    public function provideWrongToFixedFiles(): Iterator
+    {
+        yield [__DIR__ . '/Wrong/wrong.php.inc', __DIR__ . '/Correct/correct.php.inc'];
+        yield [__DIR__ . '/Wrong/wrong2.php.inc', __DIR__ . '/Correct/correct2.php.inc'];
+        yield [__DIR__ . '/Wrong/wrong3.php.inc', __DIR__ . '/Correct/correct3.php.inc'];
+    }
+
+    protected function provideConfig(): string
+    {
+        return __DIR__ . '/config.yml';
+    }
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong.php.inc
new file mode 100644
index 00000000000..103e128778e
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong.php.inc
@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector;
+
+use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source\SomeChildOfValueObject;
+
+class ActionClass
+{
+    /**
+     * @var SomeChildOfValueObject|null
+     */
+    private $someChildValueObject;
+
+    public function someFunction()
+    {
+        $this->someChildValueObject = new SomeChildOfValueObject('value');
+
+        $someChildValueObject = new SomeChildOfValueObject();
+    }
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong2.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong2.php.inc
new file mode 100644
index 00000000000..9c9eeae4e9d
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong2.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace SomeNamespace;
+
+use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
+
+class FourthActionClass
+{
+    public function someFunction(?SomeValueObject $name): ?SomeValueObject
+    {
+        /** @var SomeValueObject|null $someValueObject */
+        $someValueObject = new SomeValueObject('value');
+    }
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong3.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong3.php.inc
new file mode 100644
index 00000000000..c76616daaec
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/Wrong/wrong3.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace SomeNamespace;
+
+use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
+
+class ThirdActionClass
+{
+    /**
+     * @param null|SomeValueObject $name
+     */
+    public function someFunction(?SomeValueObject $name): ?SomeValueObject
+    {
+    }
+}
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/config.yml b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/config.yml
new file mode 100644
index 00000000000..191ee6fc4f6
--- /dev/null
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverDocBlockRector/config.yml
@@ -0,0 +1,4 @@
+services:
+    Rector\Rector\DomainDrivenDesign\ValueObjectRemover\ValueObjectRemoverDocBlockRector:
+        $valueObjectsToSimpleTypes:
+            'Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverDocBlockRector\Source\SomeValueObject': 'string'
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct.php.inc
index 16109475cd1..c5e90b356dc 100644
--- a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct.php.inc
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct.php.inc
@@ -7,7 +7,7 @@ use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverRector\Source\SomeC
 class ActionClass
 {
     /**
-     * @var string|null
+     * @var SomeChildOfValueObject|null
      */
     private $someChildValueObject;
 
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct3.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct3.php.inc
index f927080118f..1affe1b0d51 100644
--- a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct3.php.inc
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct3.php.inc
@@ -7,7 +7,7 @@ use Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverRector\Source\SomeV
 class ThirdActionClass
 {
     /**
-     * @param null|string $name
+     * @param null|SomeValueObject $name
      */
     public function someFunction(?string $name): ?string
     {
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct4.php.inc b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct4.php.inc
index a5fd2a2d829..436330db34a 100644
--- a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct4.php.inc
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/Correct/correct4.php.inc
@@ -8,7 +8,7 @@ class FourthActionClass
 {
     public function someFunction(?string $name): ?string
     {
-        /** @var string|null $someValueObject */
+        /** @var SomeValueObject|null $someValueObject */
         $someValueObject = 'value';
     }
 }
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php
index 2c944815356..cd98e705701 100644
--- a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php
@@ -22,9 +22,9 @@ final class ValueObjectRemoverRectorTest extends AbstractRectorTestCase
     public function provideWrongToFixedFiles(): Iterator
     {
         yield [__DIR__ . '/Wrong/wrong.php.inc', __DIR__ . '/Correct/correct.php.inc'];
-//        yield [__DIR__ . '/Wrong/wrong2.php.inc', __DIR__ . '/Correct/correct2.php.inc'];
-//        yield [__DIR__ . '/Wrong/wrong3.php.inc', __DIR__ . '/Correct/correct3.php.inc'];
-//        yield [__DIR__ . '/Wrong/wrong4.php.inc', __DIR__ . '/Correct/correct4.php.inc'];
+        yield [__DIR__ . '/Wrong/wrong2.php.inc', __DIR__ . '/Correct/correct2.php.inc'];
+        yield [__DIR__ . '/Wrong/wrong3.php.inc', __DIR__ . '/Correct/correct3.php.inc'];
+        yield [__DIR__ . '/Wrong/wrong4.php.inc', __DIR__ . '/Correct/correct4.php.inc'];
     }
 
     protected function provideConfig(): string
diff --git a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/config.yml b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/config.yml
index 41f03f72df9..6a9fb1807d3 100644
--- a/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/config.yml
+++ b/tests/Rector/DomainDrivenDesign/ValueObjectRemoverRector/config.yml
@@ -1,9 +1,4 @@
 services:
-    # todo: combine configuration in some way
-    Rector\Rector\DomainDrivenDesign\ValueObjectRemover\ValueObjectRemoverDocBlockRector:
-        $valueObjectsToSimpleTypes:
-            'Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverRector\Source\SomeValueObject': 'string'
-
     Rector\Rector\DomainDrivenDesign\ValueObjectRemover\ValueObjectRemoverRector:
         $valueObjectsToSimpleTypes:
             'Rector\Tests\Rector\DomainDrivenDesign\ValueObjectRemoverRector\Source\SomeValueObject': 'string'