diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
deleted file mode 100644
index b69ff789021..00000000000
--- a/.phpstorm.meta.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-namespace PHPSTORM_META {
-
-    override(
-        \PHPUnit\Framework\TestCase::createMock(0),
-        map([""=>"$0"])
-    );
-
-    override(
-        \PHPUnit\Framework\TestCase::createStub(0),
-        map([""=>"$0"])
-    );
-
-    override(
-        \PHPUnit\Framework\TestCase::createConfiguredMock(0),
-        map([""=>"$0"])
-    );
-
-    override(
-        \PHPUnit\Framework\TestCase::createPartialMock(0),
-        map([""=>"$0"])
-    );
-
-    override(
-        \PHPUnit\Framework\TestCase::createTestProxy(0),
-        map([""=>"$0"])
-    );
-
-    override(
-        \PHPUnit\Framework\TestCase::getMockForAbstractClass(0),
-        map([""=>"$0"])
-    );
-}
diff --git a/ChangeLog-8.5.md b/ChangeLog-8.5.md
index 3a4e7885fa2..22717179d88 100644
--- a/ChangeLog-8.5.md
+++ b/ChangeLog-8.5.md
@@ -2,6 +2,10 @@
 
 All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [8.5.40] - 2024-MM-DD
+
+* Removed `.phpstorm.meta.php` file as methods such as `TestCase::createStub()` use generics / template types for their return types and PhpStorm, for example, uses that information
+
 ## [8.5.39] - 2024-07-10
 
 ### Changed
@@ -307,6 +311,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 * [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable`
 * [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside
 
+[8.5.40]: https://github.com/sebastianbergmann/phpunit/compare/8.5.39...8.5
 [8.5.39]: https://github.com/sebastianbergmann/phpunit/compare/8.5.38...8.5.39
 [8.5.38]: https://github.com/sebastianbergmann/phpunit/compare/8.5.37...8.5.38
 [8.5.37]: https://github.com/sebastianbergmann/phpunit/compare/8.5.36...8.5.37
diff --git a/build.xml b/build.xml
index 4942d528cc6..f1fdffb5788 100644
--- a/build.xml
+++ b/build.xml
@@ -355,8 +355,6 @@
         <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/TestCaseClass.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\CodeCoverage"/>
         <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/TestCaseMethod.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnitPHAR\SebastianBergmann\CodeCoverage\CodeCoverage"/>
 
-        <copy file="${basedir}/.phpstorm.meta.php" tofile="${basedir}/build/tmp/phar-scoped/.phpstorm.meta.php"/>
-
         <exec executable="${basedir}/tools/phpab" taskname="phpab" failonerror="true">
             <arg value="--all" />
             <arg value="--phar" />