diff --git a/appveyor.yml b/appveyor.yml
index a5d05c6bdc..f2eab32953 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,26 +39,29 @@ before_build:
         }
 
 build_script:
+    - cd _build
     - ps: >-
         If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
-            cd _build
             cmd /c "nmake 2>&1"
-            cd ..
         }
+    - cd ..
 
 test_script:
+    - cd _build
     - ps: >-
         If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
-            cd _build
             if ($env:EXTENDED_TESTS) {
                 cmd /c "nmake test V=1 2>&1"
-                mkdir ..\_install
-                cmd /c "nmake install install_docs DESTDIR=..\_install 2>&1"
             } Else {
                 cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1"
             }
-            cd ..
         }
+    - ps: >-
+        if ($env:EXTENDED_TESTS) {
+            mkdir ..\_install
+            cmd /c "nmake install install_docs DESTDIR=..\_install 2>&1"
+        }
+    - cd ..
 
 notifications:
     - provider: Email