diff --git a/ChangeLog-8.4.md b/ChangeLog-8.4.md
index 67bd0bc2f9f..16bf28c20a8 100644
--- a/ChangeLog-8.4.md
+++ b/ChangeLog-8.4.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 8.4 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [8.4.4] - 2019-MM-DD
+
+### Fixed
+
+* Fixed [#3953](https://github.com/sebastianbergmann/phpunit/issues/3953): Code Coverage for test executed in isolation does not work when the PHAR is used
+
 ## [8.4.3] - 2019-11-06
 
 ### Fixed
@@ -37,6 +43,7 @@ All notable changes of the PHPUnit 8.4 release series are documented in this fil
 
 * The method `expectExceptionMessageRegExp()` is now deprecated. There is no behavioral change in this version of PHPUnit. Using this method will trigger a deprecation warning in PHPUnit 9 and in PHPUnit 10 it will be removed. Please use `expectExceptionMessageMatches()` instead.
 
+[8.4.4]: https://github.com/sebastianbergmann/phpunit/compare/8.4.3...8.4
 [8.4.3]: https://github.com/sebastianbergmann/phpunit/compare/8.4.2...8.4.3
 [8.4.2]: https://github.com/sebastianbergmann/phpunit/compare/8.4.1...8.4.2
 [8.4.1]: https://github.com/sebastianbergmann/phpunit/compare/8.4.0...8.4.1
diff --git a/build.xml b/build.xml
index 5b9588bf553..2952e62c811 100644
--- a/build.xml
+++ b/build.xml
@@ -374,6 +374,10 @@
 
         <copy file="${basedir}/.phpstorm.meta.php" tofile="${basedir}/build/phar-scoped/.phpstorm.meta.php"/>
 
+        <replace file="${basedir}/build/phar-scoped/phpunit/Util/PHP/Template/PhptTestCase.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
+        <replace file="${basedir}/build/phar-scoped/phpunit/Util/PHP/Template/TestCaseClass.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
+        <replace file="${basedir}/build/phar-scoped/phpunit/Util/PHP/Template/TestCaseMethod.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
+
         <exec executable="${basedir}/tools/phpab" taskname="phpab" failonerror="true">
             <arg value="--all" />
             <arg value="--static" />