diff --git a/appveyor.yml b/appveyor.yml
index a699920..9af2c68 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,15 +14,15 @@ environment:
   matrix:
   - TOXENV: py37-default
     COVERAGE_FILENAME: py37-default_coverage.xml
-    COVERAGE_FILENAME: py37-legacy_wexpect_coverage.xml
     PYTHON: "C:\\Python37"
   - TOXENV: py37-spawn_pipe
     COVERAGE_FILENAME: py37-spawn_pipe_coverage.xml
     PYTHON: "C:\\Python37"
   - TOXENV: installed
     PYTHON: "C:\\Python37"
-    PYTHON: "C:\\Python37"
   - TOXENV: py37-legacy_wexpect
+    COVERAGE_FILENAME: py37-legacy_wexpect_coverage.xml
+    PYTHON: "C:\\Python37"
 
 build: off
 
@@ -36,22 +36,21 @@ test_script:
 after_test:
   # Upload code coverage results.
   # https://github.com/codecov/codecov-python/issues/158#issuecomment-514282362
-  - IF "%COVERAGE_FILENAME%"!="" (
+  - IF NOT "%COVERAGE_FILENAME%"=="" (
       (codecov --no-color -X gcov --file %COVERAGE_FILENAME% --required ) || (sleep 30 && codecov --no-color -X gcov --file %COVERAGE_FILENAME% --required )
     )
+    
   # fill .pypirc file.
   # pypi
-  - |-
-      "echo [pypi] > %USERPROFILE%\\.pypirc"
-      "echo repository: https://upload.pypi.org/legacy/ >> %USERPROFILE%\\.pypirc"
-      "echo username: __token__ >> %USERPROFILE%\\.pypirc"
-      "echo password: %pypipw% >> %USERPROFILE%\\.pypirc"
-  # testpypi
-  - |-
-      "echo [testpypi] >> %USERPROFILE%\\.pypirc"
-      "echo repository: https://test.pypi.org/legacy/ >> %USERPROFILE%\\.pypirc"
-      "echo username: __token__ >> %USERPROFILE%\\.pypirc"
-      "echo password: %testpypipw% >> %USERPROFILE%\\.pypirc"
+  - cmd: "echo [pypi] > %USERPROFILE%\\.pypirc" 
+  - cmd: "echo repository: https://upload.pypi.org/legacy/ >> %USERPROFILE%\\.pypirc" 
+  - cmd: "echo username: __token__ >> %USERPROFILE%\\.pypirc" 
+  - cmd: "echo password: %pypipw% >> %USERPROFILE%\\.pypirc" 
+  # testpypi 
+  - cmd: "echo [testpypi] >> %USERPROFILE%\\.pypirc" 
+  - cmd: "echo repository: https://test.pypi.org/legacy/ >> %USERPROFILE%\\.pypirc" 
+  - cmd: "echo username: __token__ >> %USERPROFILE%\\.pypirc" 
+  - cmd: "echo password: %testpypipw% >> %USERPROFILE%\\.pypirc" 
 
   # Create source distribution.
   - python -m setup sdist