diff --git a/appveyor.yml b/appveyor.yml
index 0a6461ab..e194bf79 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,5 @@
 build: false
+image: Visual Studio 2022
 clone_folder: c:\projects\grumphp
 clone_depth: 1
 shallow_clone: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8bf2cef5..bda185a3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,6 +9,13 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <!--
+            Since git 2.47, commits spawn a detached auto maintenance process that keeps writing
+            .git/objects/maintenance.lock after the commit returns, racing the E2E cleanup of the test repos.
+        -->
+        <env name="GIT_CONFIG_COUNT" value="1" />
+        <env name="GIT_CONFIG_KEY_0" value="maintenance.auto" />
+        <env name="GIT_CONFIG_VALUE_0" value="false" />
     </php>
     <testsuites>
         <testsuite name="Unit">
diff --git a/test/E2E/AbstractE2ETestCase.php b/test/E2E/AbstractE2ETestCase.php
index 6f093604..ac7d25c9 100644
--- a/test/E2E/AbstractE2ETestCase.php
+++ b/test/E2E/AbstractE2ETestCase.php
@@ -121,7 +121,7 @@ protected function initializeComposer(string $path): string
                 '--name=grumphp/testsuite'.$this->hash,
                 '--type=library',
                 '--require=php:*',
-                '--require-dev=phpro/grumphp:'.$this->detectCurrentGrumphpGitBranchForComposerWithFallback(),
+                '--require-dev=phpro/grumphp:*@dev',
                 '--require-dev=phpunit/phpunit:*',
                 '--author=GrumPHP Testsuite',
                 '--repository='.json_encode([
@@ -156,38 +156,6 @@ protected function initializeComposer(string $path): string
         return $composerFile;
     }
 
-    private function detectCurrentGrumphpGitBranchForComposerWithFallback(): string
-    {
-        $gitExecutable = $this->executableFinder->find('git');
-        $process = new Process([$gitExecutable, 'rev-parse', '--abbrev-ref', 'HEAD']);
-        $process->run();
-
-        if (!$process->isSuccessful()) {
-            return '*';
-        }
-
-        // Detached HEAD (for CI)
-        $version = trim($process->getOutput());
-        if ('HEAD' === $version) {
-            // Check if current commit matches a tag:
-            $process = new Process([$gitExecutable, 'describe', '--exact-match']);
-            $process->run();
-            if ($process->isSuccessful()) {
-                return trim($process->getOutput());
-            }
-
-            // Load the sha hash instead
-            $process = new Process([$gitExecutable, 'rev-parse', '--verify', 'HEAD']);
-            $process->run();
-            if (!$process->isSuccessful()) {
-                return '*';
-            }
-            $version = trim($process->getOutput());
-        }
-
-        return 'dev-'.$version.'@dev';
-    }
-
     protected function mergeComposerConfig(string $composerFile, array $config, $recursive = true)
     {
         $this->assertFileExists($composerFile);