diff --git a/.gitignore b/.gitignore
index 7b7b8bf..f7413f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-
 # Created by https://www.toptal.com/developers/gitignore/api/autotools,cmake,phpstorm
 # Edit at https://www.toptal.com/developers/gitignore?templates=autotools,cmake,phpstorm
 
@@ -182,6 +181,8 @@ fabric.properties
 build/
 configure.in
 configure.ac
+configure.bat
+configure.js
 mkinstalldirs
 run-tests.php
 Makefile.global
@@ -191,6 +192,7 @@ modules/
 *.lo
 config.h
 config.nice
+config.nice.bat
 *.la
 Makefile*
 !Makefile.am
@@ -204,6 +206,7 @@ PHP-Parser*/
 src/*.so
 src/*.dylib
 src/*.dll
+/x64/
 
 # ignoring output of package.xml as it needs to be generated from ./prepare_release.sh in each publishing
 package.xml
diff --git a/dev-scripts/run_tests.bat b/dev-scripts/run_tests.bat
index 28e152f..a071c24 100644
--- a/dev-scripts/run_tests.bat
+++ b/dev-scripts/run_tests.bat
@@ -13,20 +13,19 @@ set "work_dir=%script_dir%/.."
 cd %work_dir%
 
 set vendor_path=vendor
+REM Run command to get composer_dir
+set "composer_dir="
+for /f "usebackq delims=" %%i in (`where composer.phar`) do set "composer_dir=%%i"
 
 if not exist "%vendor_path%" (
-  REM Run command to get composer_dir
-  set "composer_dir="
-  for /f "usebackq delims=" %%i in (`where composer.phar`) do set "composer_dir=%%i"
-
   REM Check if composer_dir was found
   if "%composer_dir%"=="" (
     echo No composer found.
     exit /b 1
   )
+  call %PHP_BINARY% -c php-win.ini %composer_dir% update
 )
 
-call %PHP_BINARY% -c php-win.ini %composer_dir% update
 call %PHP_BINARY% -c php-win.ini vendor/bin/phpunit tests --debug
 
 endlocal