diff --git a/appveyor.yml b/appveyor.yml
index 7dd9b8a1..8093b422 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,7 @@ platform:
 
 install:
   - script\configure.cmd
+  - script\fetch-fixtures.cmd
 
 test_script:
   - script\test.cmd
diff --git a/script/fetch-fixtures b/script/fetch-fixtures
index 2575e2b6..5b32a66e 100755
--- a/script/fetch-fixtures
+++ b/script/fetch-fixtures
@@ -11,22 +11,22 @@ fetch_grammar() {
   echo "Updating ${grammar} grammar..."
 
   if [ ! -d $grammar_dir ]; then
-    git clone $grammar_url $grammar_dir
+    git clone $grammar_url $grammar_dir --depth=1
   fi
 
   (
     cd $grammar_dir;
-    git fetch origin
-    git reset --hard $ref;
+    git fetch origin $ref --depth=1
+    git reset --hard origin/$ref;
   )
 }
 
-fetch_grammar 'javascript' 'origin/master'
-fetch_grammar 'json'       'origin/master'
-fetch_grammar 'c'          'origin/master'
-fetch_grammar 'cpp'        'origin/master'
-fetch_grammar 'python'     'origin/master'
-fetch_grammar 'go'         'origin/master'
-fetch_grammar 'ruby'       'origin/master'
-fetch_grammar 'typescript' 'origin/master'
-fetch_grammar 'bash'       'origin/master'
+fetch_grammar javascript master
+fetch_grammar json       master
+fetch_grammar c          master
+fetch_grammar cpp        master
+fetch_grammar python     master
+fetch_grammar go         master
+fetch_grammar ruby       master
+fetch_grammar typescript master
+fetch_grammar bash       master
diff --git a/script/fetch-fixtures.cmd b/script/fetch-fixtures.cmd
new file mode 100644
index 00000000..1effc141
--- /dev/null
+++ b/script/fetch-fixtures.cmd
@@ -0,0 +1,26 @@
+@echo off
+
+call:fetch_grammar javascript master
+call:fetch_grammar json       master
+call:fetch_grammar c          master
+call:fetch_grammar cpp        master
+call:fetch_grammar python     master
+call:fetch_grammar go         master
+call:fetch_grammar ruby       master
+call:fetch_grammar typescript master
+call:fetch_grammar bash       master
+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% (
+  git clone %grammar_url% %grammar_dir% --depth=1
+)
+pushd %grammar_dir%
+git fetch origin %2 --depth=1
+git reset --hard origin/%grammar_branch%
+popd
+EXIT /B 0
diff --git a/script/test.cmd b/script/test.cmd
index 09096adc..31907ab6 100644
--- a/script/test.cmd
+++ b/script/test.cmd
@@ -1,2 +1,2 @@
 msbuild /p:Configuration=Test tests.vcxproj
-.\test\tests.exe --reporter=singleline
\ No newline at end of file
+.\test\tests.exe --reporter=singleline --no-color
\ No newline at end of file