diff --git a/appveyor.yml b/appveyor.yml
index f5bf6cd28..48066ec78 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,7 +54,7 @@ configuration: Debug
 
 build:
   parallel: true                  # enable MSBuild parallel builds
-  project: MyTestAzureCS.sln      # path to Visual Studio solution or project
+  project: build\xenia\xenia.sln  # path to Visual Studio solution or project
 
   # MSBuild verbosity level
   verbosity: quiet|minimal|normal|detailed
@@ -67,8 +67,8 @@ before_build:
 after_build:
 
 # to run your custom scripts instead of automatic MSBuild
-build_script:
-  - cmd: tools\buildbot\build.bat
+#build_script:
+#  - cmd: tools\buildbot\build.bat
 
 # to disable automatic builds
 #build: off
diff --git a/tools/buildbot/setup.bat b/tools/buildbot/setup.bat
index 51d373a8f..59ddf0857 100644
--- a/tools/buildbot/setup.bat
+++ b/tools/buildbot/setup.bat
@@ -1,3 +1,3 @@
-@ECHO OFF
+REM @ECHO OFF
 
-python xenia-build.py setup
+python xenia-build.py setup --no-ninja
diff --git a/xenia-build.py b/xenia-build.py
index 7b7944436..e80b14130 100644
--- a/xenia-build.py
+++ b/xenia-build.py
@@ -275,7 +275,8 @@ class SetupCommand(Command):
       print('')
 
     # Run the ninja bootstrap to build it, if it's missing.
-    if (not os.path.exists('third_party/ninja/ninja') and
+    if (not '--no-ninja' in args and
+        not os.path.exists('third_party/ninja/ninja') and
        not os.path.exists('third_party/ninja/ninja.exe')):
       print('- preparing ninja...')
       os.chdir('third_party/ninja')