diff --git a/appveyor.yml b/appveyor.yml
index 7570fbe..77b28ad 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,8 @@ install:
   - ps: |
       Add-Content -Path run-cask -Value @'
       #!/usr/bin/env bash
-      $CASK_PYTHON ~/.cask/bin/cask $@ 2>&1
+      # Swap stderr and stdout, seems that they are mixed up.
+      $CASK_PYTHON ~/.cask/bin/cask $@ 3>&2 2>&1 1>&3
       '@
   - chmod +x run-cask
   - set PATH=%APPVEYOR_BUILD_FOLDER%;%PATH%
@@ -82,8 +83,8 @@ test_script:
       # return null even though the Job is supposes to be complete. The
       # recommended solution is to ensure WaitForExit() is called.
       $emacs.WaitForExit()
-      $emacs_exitcode = $emacs.ExitCode
-      if ($emacs_exitcode -eq 0) {
+      Write-Host "Emacs ExitCode '$($emacs.ExitCode)'"
+      if ($emacs.ExitCode -eq 0) {
           Write-Host "Tests passed" -BackgroundColor green
       } else {
           throw "Tests failed"