diff --git a/appveyor.yml b/appveyor.yml
index 655d4ec8..6f9f9170 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -52,7 +52,7 @@ build: false
 test_script:
   # Build the docs
   - pip install sphinx
-  - cd doc && make html
+  - SET PYTHON=%PYTHON%\\python.exe && cd doc && make html
 
   # Change to a non-source folder to make sure we run the tests on the
   # installed library.
diff --git a/doc/make.bat b/doc/make.bat
index e7c61181..b37f82fa 100644
--- a/doc/make.bat
+++ b/doc/make.bat
@@ -47,6 +47,7 @@ if "%1" == "html" (
 	mkdir source/api
 	%PYTHON% tools/build_modref_templates.py 
 	cd source && %PYTHON% random_gallery.py
+	cd ..
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
 	echo.
 	echo.Build finished. The HTML pages are in %BUILDDIR%/html.