diff --git a/script/fetch-fixtures.cmd b/script/fetch-fixtures.cmd
index 98d5d578..011d73ff 100644
--- a/script/fetch-fixtures.cmd
+++ b/script/fetch-fixtures.cmd
@@ -12,18 +12,18 @@ call:fetch_grammar python            master
 call:fetch_grammar ruby              master
 call:fetch_grammar rust              master
 call:fetch_grammar typescript        master
-EXIT /B 0
+exit /B 0
 
 :fetch_grammar
-SETLOCAL
-SET grammar_dir=test\fixtures\grammars\%~1
-SET grammar_url=https://github.com/tree-sitter/tree-sitter-%~1
-SET grammar_branch=%~2
-@IF NOT EXIST %grammar_dir% (
+setlocal
+set grammar_dir=test\fixtures\grammars\%~1
+set grammar_url=https://github.com/tree-sitter/tree-sitter-%~1
+set grammar_branch=%~2
+@if not exist %grammar_dir% (
   git clone %grammar_url% %grammar_dir% --depth=1
 )
 pushd %grammar_dir%
 git fetch origin %2 --depth=1
 git reset --hard FETCH_HEAD
 popd
-EXIT /B 0
+exit /B 0
diff --git a/script/regenerate-fixtures.cmd b/script/regenerate-fixtures.cmd
index 739bdba1..b307409e 100644
--- a/script/regenerate-fixtures.cmd
+++ b/script/regenerate-fixtures.cmd
@@ -10,13 +10,13 @@ call:regenerate javascript
 call:regenerate json
 call:regenerate python
 call:regenerate rust
-EXIT /B 0
+exit /B 0
 
 :regenerate
-SETLOCAL
-SET tree_sitter=%cd%\target\release\tree-sitter
-SET grammar_dir=test\fixtures\grammars\%~1
+setlocal
+set tree_sitter=%cd%\target\release\tree-sitter
+set grammar_dir=test\fixtures\grammars\%~1
 pushd %grammar_dir%
 %tree_sitter% generate src\grammar.json
 popd
-EXIT /B 0
+exit /B 0
diff --git a/script/test.cmd b/script/test.cmd
index ef4ce02e..d1b462e8 100644
--- a/script/test.cmd
+++ b/script/test.cmd
@@ -1,7 +1,8 @@
 @echo off
 
+setlocal
 set TREE_SITTER_TEST=1
 set RUST_TEST_THREADS=1
 set RUST_BACKTRACE=full
-
 cargo test "%~1" -- --nocapture
+endlocal