diff --git a/scripts/test_msys2.cmd b/scripts/test_msys2.cmd
index 0e7e1a8..6874000 100755
--- a/scripts/test_msys2.cmd
+++ b/scripts/test_msys2.cmd
@@ -4,18 +4,22 @@ setlocal EnableExtensions
 
 set "SED=sed"
 
-set "SCRIPTS_DIR=%~dp0"
+set "SCRIPTS_DIR=%~dp0%"
 pushd "%SCRIPTS_DIR%"
 set "SCRIPTS_DIR=%CD%"
 popd
 
-set "SOURCE_DIR=%~dp0.."
+set "SOURCE_DIR=%~dp0%.."
 pushd "%SOURCE_DIR%"
 set "SOURCE_DIR=%CD%"
 popd
 
 set "TEST_DIR=%SOURCE_DIR%\build"
 
+echo %SCRIPTS_DIR%
+echo %SOURCE_DIR%
+echo %TEST_DIR%
+
 set "PLATFORM=msys2"
 set "BUILD_TYPE=%~1"
 set "WITH_TYPE=%~2"
@@ -42,7 +46,7 @@ if "%WITH_TYPE%"=="7" set "NAME=%NAME%_crypto_no_boost"
 if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%"
 
 pushd "%SOURCE_DIR%"
-".\create_project.cmd" "%NAME%" "%TEST_DIR%" || (
+call ".\create_project.cmd" "%NAME%" "%TEST_DIR%" || (
   call :ERROR_EXIT "Failed to create %PLATFORM% project." 2
 )
 popd
@@ -64,19 +68,19 @@ if /I "%BUILD_TYPE%"=="shared" (
   %SED% -i "s/PROJECT_STATIC_LINK=ON/PROJECT_STATIC_LINK=OFF/g" ".\config.sh"
 )
 
-".\scripts\make_win32.cmd" || (
+call ".\scripts\make_win32.cmd" || (
   call :ERROR_EXIT "build %PLATFORM% failed." 3
 )
 
-".\scripts\run_tests.cmd" || (
+call ".\scripts\run_tests.cmd" || (
   call :ERROR_EXIT "testing %PLATFORM% failed." 3
 )
 popd
 
 if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%"
 
-exit /b 0
+exit 0
 
 :ERROR_EXIT
-echo %~1
-exit /b %~2
+echo "%~1"
+exit %~2