diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 72d995b03..0ed531201 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -151,7 +151,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.4"
+          - "8.5"
         operating-system:
           - "ubuntu-latest"
 
diff --git a/test/unit/Fixture/ClassForSourceStubber.php b/test/unit/Fixture/ClassForSourceStubber.php
index c625581a0..957082a3c 100644
--- a/test/unit/Fixture/ClassForSourceStubber.php
+++ b/test/unit/Fixture/ClassForSourceStubber.php
@@ -128,10 +128,6 @@ public function methodWithOptionalParameters(string $string = 'string', int $int
     {
     }
 
-    public function methodWithSelfAndParentParameters(self $self, parent $parent) : void
-    {
-    }
-
     public function methodWithVariadicParameter(string ...$variadic) : void
     {
     }
diff --git a/test/unit/Fixture/ClassForSourceStubberExpected.php b/test/unit/Fixture/ClassForSourceStubberExpected.php
index 83cf382f0..1618af6ba 100644
--- a/test/unit/Fixture/ClassForSourceStubberExpected.php
+++ b/test/unit/Fixture/ClassForSourceStubberExpected.php
@@ -67,9 +67,6 @@ public function methodWithParametersWithNullableTypes(?string $string, ?int $int
     public function methodWithOptionalParameters(string $string = 'string', int $int = 123, float $float = 0.0, bool $bool = true, iterable $iterable = [], ?callable $callable = null): void
     {
     }
-    public function methodWithSelfAndParentParameters(self $self, parent $parent): void
-    {
-    }
     public function methodWithVariadicParameter(string ...$variadic): void
     {
     }
diff --git a/test/unit/Fixture/ClassWithSelfAndParentParametersForSourceStubber.php b/test/unit/Fixture/ClassWithSelfAndParentParametersForSourceStubber.php
new file mode 100644
index 000000000..a04a24db9
--- /dev/null
+++ b/test/unit/Fixture/ClassWithSelfAndParentParametersForSourceStubber.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Roave\BetterReflectionTest\Fixture;
+
+class ParentClassWithSelfAndParentParametersForSourceStubber
+{
+}
+
+abstract class ClassWithSelfAndParentParametersForSourceStubber extends ParentClassWithSelfAndParentParametersForSourceStubber
+{
+    public function methodWithSelfAndParentParameters(self $self, parent $parent) : void
+    {
+    }
+}
diff --git a/test/unit/Fixture/ClassWithSelfAndParentParametersForSourceStubberExpected.php b/test/unit/Fixture/ClassWithSelfAndParentParametersForSourceStubberExpected.php
new file mode 100644
index 000000000..c7a047c91
--- /dev/null
+++ b/test/unit/Fixture/ClassWithSelfAndParentParametersForSourceStubberExpected.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Roave\BetterReflectionTest\Fixture;
+
+abstract class ClassWithSelfAndParentParametersForSourceStubber extends \Roave\BetterReflectionTest\Fixture\ParentClassWithSelfAndParentParametersForSourceStubber
+{
+    public function methodWithSelfAndParentParameters(self $self, parent $parent): void
+    {
+    }
+}
diff --git a/test/unit/Fixture/PHP85ClassForSourceStubber.php b/test/unit/Fixture/PHP85ClassForSourceStubber.php
deleted file mode 100644
index bf59f7aab..000000000
--- a/test/unit/Fixture/PHP85ClassForSourceStubber.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Roave\BetterReflectionTest\Fixture;
-
-class ParentClassForSourceStubber
-{
-}
-
-abstract class PHP85ClassForSourceStubber extends ParentClassForSourceStubber
-{
-    public function methodWithSelfAndParentParameters(self $self, parent $parent) : void
-    {
-    }
-}
diff --git a/test/unit/Fixture/PHP85ClassForSourceStubberExpected.php b/test/unit/Fixture/PHP85ClassForSourceStubberExpected.php
deleted file mode 100644
index 0c785017b..000000000
--- a/test/unit/Fixture/PHP85ClassForSourceStubberExpected.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Roave\BetterReflectionTest\Fixture;
-
-abstract class PHP85ClassForSourceStubber extends \Roave\BetterReflectionTest\Fixture\ParentClassForSourceStubber
-{
-    public function methodWithSelfAndParentParameters(\Roave\BetterReflectionTest\Fixture\PHP85ClassForSourceStubber $self, \Roave\BetterReflectionTest\Fixture\ParentClassForSourceStubber $parent): void
-    {
-    }
-}
diff --git a/test/unit/Fixture/PHP85ClassWithSelfAndParentParametersForSourceStubberExpected.php b/test/unit/Fixture/PHP85ClassWithSelfAndParentParametersForSourceStubberExpected.php
new file mode 100644
index 000000000..0ee8ceb81
--- /dev/null
+++ b/test/unit/Fixture/PHP85ClassWithSelfAndParentParametersForSourceStubberExpected.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Roave\BetterReflectionTest\Fixture;
+
+abstract class ClassWithSelfAndParentParametersForSourceStubber extends \Roave\BetterReflectionTest\Fixture\ParentClassWithSelfAndParentParametersForSourceStubber
+{
+    public function methodWithSelfAndParentParameters(\Roave\BetterReflectionTest\Fixture\ClassWithSelfAndParentParametersForSourceStubber $self, \Roave\BetterReflectionTest\Fixture\ParentClassWithSelfAndParentParametersForSourceStubber $parent): void
+    {
+    }
+}
diff --git a/test/unit/SourceLocator/SourceStubber/ReflectionSourceStubberTest.php b/test/unit/SourceLocator/SourceStubber/ReflectionSourceStubberTest.php
index 3b972d7ee..f267539c7 100644
--- a/test/unit/SourceLocator/SourceStubber/ReflectionSourceStubberTest.php
+++ b/test/unit/SourceLocator/SourceStubber/ReflectionSourceStubberTest.php
@@ -29,13 +29,13 @@
 use Roave\BetterReflectionTest\BetterReflectionSingleton;
 use Roave\BetterReflectionTest\Fixture\ClassForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\ClassForSourceStubberWithDefaultStaticProperty;
+use Roave\BetterReflectionTest\Fixture\ClassWithSelfAndParentParametersForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\EmptyTrait;
 use Roave\BetterReflectionTest\Fixture\EnumBackedForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\EnumPureForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\InterfaceForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\PHP81ClassForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\PHP83ClassForSourceStubber;
-use Roave\BetterReflectionTest\Fixture\PHP85ClassForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\PHP8ClassForSourceStubber;
 use Roave\BetterReflectionTest\Fixture\TraitForSourceStubber;
 use stdClass;
@@ -116,7 +116,6 @@ public function testCanStubTraits(): void
         self::assertNull($stubData->getExtensionName());
     }
 
-    #[RequiresPhp('<8.5.0')]
     public function testClassStub(): void
     {
         require_once __DIR__ . '/../../Fixture/ClassForSourceStubber.php';
@@ -189,15 +188,26 @@ public function testClassStubWithTypedConstants(): void
         self::assertStringEqualsFile(__DIR__ . '/../../Fixture/PHP83ClassForSourceStubberExpected.php', $stubData->getStub());
     }
 
+    #[RequiresPhp('<8.5.0')]
+    public function testClassStubWithSelfAndParentParameters(): void
+    {
+        require_once __DIR__ . '/../../Fixture/ClassWithSelfAndParentParametersForSourceStubber.php';
+
+        $stubData = $this->stubber->generateClassStub(ClassWithSelfAndParentParametersForSourceStubber::class);
+
+        self::assertNotNull($stubData);
+        self::assertStringEqualsFile(__DIR__ . '/../../Fixture/ClassWithSelfAndParentParametersForSourceStubberExpected.php', $stubData->getStub());
+    }
+
     #[RequiresPhp('>=8.5.0')]
-    public function testClassStubWithPHP85Changes(): void
+    public function testClassStubWithSelfAndParentParametersWithPHP85Changes(): void
     {
-        require_once __DIR__ . '/../../Fixture/PHP85ClassForSourceStubber.php';
+        require_once __DIR__ . '/../../Fixture/ClassWithSelfAndParentParametersForSourceStubber.php';
 
-        $stubData = $this->stubber->generateClassStub(PHP85ClassForSourceStubber::class);
+        $stubData = $this->stubber->generateClassStub(ClassWithSelfAndParentParametersForSourceStubber::class);
 
         self::assertNotNull($stubData);
-        self::assertStringEqualsFile(__DIR__ . '/../../Fixture/PHP85ClassForSourceStubberExpected.php', $stubData->getStub());
+        self::assertStringEqualsFile(__DIR__ . '/../../Fixture/PHP85ClassWithSelfAndParentParametersForSourceStubberExpected.php', $stubData->getStub());
     }
 
     public function testClassWithoutNamespaceStub(): void