diff --git a/composer.json b/composer.json
index cc74ee1..e09cc3b 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
   ],
   "require": {
     "php": "^8.3",
-    "phpdocumentor/reflection-docblock": "^5.4",
+    "phpdocumentor/reflection-docblock": "^5.6",
     "psr/container": "^2.0"
   },
   "require-dev": {
diff --git a/src/Manifests/ContainerMixinManifest.php b/src/Manifests/ContainerMixinManifest.php
index b082e88..965f8c1 100644
--- a/src/Manifests/ContainerMixinManifest.php
+++ b/src/Manifests/ContainerMixinManifest.php
@@ -114,7 +114,7 @@ public function build(array $extensionMethods, array $extensions)
                 $parameters[] = new DocBlock\Tags\MethodParameter(
                     name: $parameter->getName(),
                     type: $type,
-                    defaultValue: $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null
+                    defaultValue: $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : DocBlock\Tags\MethodParameter::NO_DEFAULT_VALUE
                 );
             }
 
diff --git a/tests/Unit/ContainerMixinManifestTest.php b/tests/Unit/ContainerMixinManifestTest.php
index e281ec1..45c0bca 100644
--- a/tests/Unit/ContainerMixinManifestTest.php
+++ b/tests/Unit/ContainerMixinManifestTest.php
@@ -54,7 +54,7 @@ public function testContainerMixinBuild()
         );
 
         $this->assertStringContainsString(
-            '@method string withNullableParameter(?string $one)',
+            '@method string withNullableParameter(?string $one = \'default value\')',
             $containerMixinContent
         );
 
diff --git a/tests/Unit/Extensions/FinancialExtensionTest.php b/tests/Unit/Extensions/FinancialExtensionTest.php
index 8f94576..d3669d6 100644
--- a/tests/Unit/Extensions/FinancialExtensionTest.php
+++ b/tests/Unit/Extensions/FinancialExtensionTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Extensions;
+namespace Xefi\Faker\Tests\Unit\Extensions;
 
 use Xefi\Faker\Calculators\Iban;
-use Xefi\Faker\Tests\Unit\Extensions\TestCase;
 
 final class FinancialExtensionTest extends TestCase
 {
diff --git a/tests/Unit/Extensions/InternetExtensionTest.php b/tests/Unit/Extensions/InternetExtensionTest.php
index 3ebd0d5..36c6f33 100644
--- a/tests/Unit/Extensions/InternetExtensionTest.php
+++ b/tests/Unit/Extensions/InternetExtensionTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Extensions;
+namespace Xefi\Faker\Tests\Unit\Extensions;
 
 use ReflectionClass;
 use Xefi\Faker\Container\Container;
-use Xefi\Faker\Tests\Unit\Extensions\TestCase;
 
 final class InternetExtensionTest extends TestCase
 {
diff --git a/tests/Unit/Modifiers/LowercaseModifierTest.php b/tests/Unit/Modifiers/LowercaseModifierTest.php
index 66a75de..942513b 100644
--- a/tests/Unit/Modifiers/LowercaseModifierTest.php
+++ b/tests/Unit/Modifiers/LowercaseModifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modifiers;
+namespace Xefi\Faker\Tests\Unit\Modifiers;
 
 use Xefi\Faker\Faker;
 use Xefi\Faker\Modifiers\LowercaseModifier;
diff --git a/tests/Unit/Modifiers/OptionalModifierTest.php b/tests/Unit/Modifiers/OptionalModifierTest.php
index 1053bcc..bdc8b3b 100644
--- a/tests/Unit/Modifiers/OptionalModifierTest.php
+++ b/tests/Unit/Modifiers/OptionalModifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modifiers;
+namespace Xefi\Faker\Tests\Unit\Modifiers;
 
 use Random\Randomizer;
 use Xefi\Faker\Faker;
diff --git a/tests/Unit/Modifiers/UppercaseModifierTest.php b/tests/Unit/Modifiers/UppercaseModifierTest.php
index 62339b3..492c661 100644
--- a/tests/Unit/Modifiers/UppercaseModifierTest.php
+++ b/tests/Unit/Modifiers/UppercaseModifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modifiers;
+namespace Xefi\Faker\Tests\Unit\Modifiers;
 
 use Xefi\Faker\Faker;
 use Xefi\Faker\Modifiers\UppercaseModifier;
diff --git a/tests/Unit/Strategies/RegexStrategyTest.php b/tests/Unit/Strategies/RegexStrategyTest.php
index 3f500e3..b279cc3 100644
--- a/tests/Unit/Strategies/RegexStrategyTest.php
+++ b/tests/Unit/Strategies/RegexStrategyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Strategies;
+namespace Xefi\Faker\Tests\Unit\Strategies;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use Xefi\Faker\Exceptions\MaximumTriesReached;