diff --git a/src/Testing/Fixture/FixtureFileFinder.php b/src/Testing/Fixture/FixtureFileFinder.php
index 10e2288ceca..d46e566dce1 100644
--- a/src/Testing/Fixture/FixtureFileFinder.php
+++ b/src/Testing/Fixture/FixtureFileFinder.php
@@ -22,7 +22,7 @@ public static function yieldDirectory(string $directory, string $suffix = '*.php
             ->sortByName();
 
         foreach ($finder as $fileInfo) {
-            yield [$fileInfo->getRealPath()];
+            yield $fileInfo->getFilename() => [$fileInfo->getRealPath()];
         }
     }
 }
diff --git a/tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/ExistingClass/fixture.php.inc b/tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/ExistingClass/ExistingClassFixture.php.inc
similarity index 100%
rename from tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/ExistingClass/fixture.php.inc
rename to tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/ExistingClass/ExistingClassFixture.php.inc
diff --git a/tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/NonExistingClass/fixture.php.inc b/tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/NonExistingClass/NonExistingClassFixture.php.inc
similarity index 100%
rename from tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/NonExistingClass/fixture.php.inc
rename to tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/NonExistingClass/NonExistingClassFixture.php.inc