diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 411f586721..28d64bc69a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -558,10 +558,9 @@ jobs:
                   New-WebHandler -Name "PHP-FastCGI" -Path "*.php" -Modules FastCgiModule -ScriptProcessor "C:\tools\php\php-cgi.exe" -Verb '*' -ResourceType Either
                   iisreset
                   NET START W3SVC
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\cache" /grant "Users:(OI)(CI)F" /T
                   mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\test"
-                  mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\test\twig"
                   mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\installer"
+                  icacls "${env:GITHUB_WORKSPACE}\phpBB\cache" /grant Users:F /T
                   icacls "${env:GITHUB_WORKSPACE}\phpBB\files" /grant Users:F /T
                   icacls "${env:GITHUB_WORKSPACE}\phpBB\store" /grant Users:F /T
                   icacls "${env:GITHUB_WORKSPACE}\phpBB\ext" /grant Users:F /T
diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index 0aad34f28a..13812a08b6 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -39,13 +39,6 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 		self::$helper->restore_original_ext_dir();
 	}
 
-	protected function tearDown(): void
-	{
-		$this->purge_cache();
-
-		parent::tearDown();
-	}
-
 	protected function setUp(): void
 	{
 		parent::setUp();
diff --git a/tests/functional/extension_template_event_order_test.php b/tests/functional/extension_template_event_order_test.php
index c77cb7b89f..c931c95bc1 100644
--- a/tests/functional/extension_template_event_order_test.php
+++ b/tests/functional/extension_template_event_order_test.php
@@ -39,13 +39,6 @@ class phpbb_functional_extension_template_event_order_test extends phpbb_functio
 		self::$helper->restore_original_ext_dir();
 	}
 
-	protected function tearDown(): void
-	{
-		$this->purge_cache();
-
-		parent::tearDown();
-	}
-
 	protected function setUp(): void
 	{
 		parent::setUp();
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index c42e0aa60b..3e0b7b32a8 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -146,6 +146,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 			// Close the database connections again this test
 			$this->db->sql_close();
 		}
+
+		$this->purge_cache();
+		sleep(3); // Give it some time to delete all the files correctly
 	}
 
 	/**