diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat
index 853f777124913..b654794518496 100644
--- a/.github/scripts/windows/build_task.bat
+++ b/.github/scripts/windows/build_task.bat
@@ -5,11 +5,6 @@ if /i "%GITHUB_ACTIONS%" neq "True" (
     exit /b 3
 )
 
-del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-
 call %~dp0find-target-branch.bat
 set STABILITY=staging
 set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%
diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat
index e3db0cf8c830d..e15259b3acc39 100644
--- a/.github/scripts/windows/test_task.bat
+++ b/.github/scripts/windows/test_task.bat
@@ -141,6 +141,8 @@ editbin /stack:8388608 %PHP_BUILD_DIR%\php-cgi.exe
 
 set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
 
+copy /-y %DEPS_DIR%\bin\*.dll %PHP_BUILD_DIR%\*
+
 if "%ASAN%" equ "1" set ASAN_OPTS=--asan
 
 mkdir c:\tests_tmp
diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt
index dc7586d5042b7..a348438bed556 100644
--- a/ext/standard/tests/file/rename_variation-win32.phpt
+++ b/ext/standard/tests/file/rename_variation-win32.phpt
@@ -61,7 +61,7 @@ bool(false)
 bool(true)
 -- Iteration 2 --
 
-Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect (code: 123) in %s on line %d
+Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): %rThe filename, directory name, or volume label syntax is incorrect|The directory name is invalid%r (code: %r123|267%r) in %s on line %d
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt
index 12ace11fc196c..016beddce1c13 100644
--- a/ext/standard/tests/file/unlink_variation8-win32.phpt
+++ b/ext/standard/tests/file/unlink_variation8-win32.phpt
@@ -95,10 +95,10 @@ file removed
 Warning: unlink(%s/BADDIR/file.tmp): No such file or directory in %s on line %d
 -- removing unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d
+Warning: unlink(unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
 -- removing %s/unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d
+Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
 -- removing unlinkVar8.tmp//file.tmp --
 file removed
 -- removing %s//unlinkVar8.tmp//file.tmp --
diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt
index a69c27088e94a..68e11be927637 100644
--- a/ext/standard/tests/file/unlink_variation9-win32.phpt
+++ b/ext/standard/tests/file/unlink_variation9-win32.phpt
@@ -97,10 +97,10 @@ file removed
 Warning: unlink(%s\BADDIR\file.tmp): No such file or directory in %s on line %d
 -- removing unlinkVar9.tmp\file.tmp\ --
 
-Warning: unlink(unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d
+Warning: unlink(unlinkVar9.tmp\file.tmp\): %rNo such file or directory|Not a directory%r in %s on line %d
 -- removing %s\unlinkVar9.tmp\file.tmp\ --
 
-Warning: unlink(%s\unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d
+Warning: unlink(%s\unlinkVar9.tmp\file.tmp\): %rNo such file or directory|Not a directory%r in %s on line %d
 -- removing unlinkVar9.tmp\\file.tmp --
 file removed
 -- removing %s\\unlinkVar9.tmp\\file.tmp --