diff --git a/appveyor.yml b/appveyor.yml
index d8a13d9..3d387a6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,16 +13,13 @@ environment:
 
 build: off
 
-install:
-  - pip install .[test]
-
 test_script:
   - tox
 
 after_test:
   # Upload code coverage results.
   # https://github.com/codecov/codecov-python/issues/158#issuecomment-514282362
-  - codecov --no-color -X gcov --file coverage.xml --required || (sleep 5 && codecov --no-color -X gcov --file coverage.xml --required) || (sleep 5 && codecov --no-color -X gcov --file coverage.xml --required) || (sleep 5 && codecov --no-color -X gcov --file coverage.xml --required) || (sleep 5 && codecov --no-color -X gcov --file coverage.xml --required)
+  - (codecov --no-color -X gcov --file py37-default_coverage.xml --required && codecov --no-color -X gcov --file py37-legacy_wexpect_coverage.xml --required && codecov --no-color -X gcov --file py37-spawn_pipe_coverage.xml --required) || (sleep 30 && codecov --no-color -X gcov --file py37-default_coverage.xml --required && codecov --no-color -X gcov --file py37-legacy_wexpect_coverage.xml --required && codecov --no-color -X gcov --file py37-spawn_pipe_coverage.xml --required)
   # fill .pypirc file.
   # pypi
   - cmd: "echo [pypi] > %USERPROFILE%\\.pypirc"
diff --git a/tox.ini b/tox.ini
index 161361a..4db4a9f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,28 @@
 # tox.ini
+# Run tests of wexpect in multiple configuration. 
 
 [tox]
+# The following configuration will run automatically.
 envlist = py{37}-{default,legacy_wexpect,spawn_pipe}
 
 [testenv]
 description = Unit tests
+
+# Set environment variables to select the proper configuration for each envirnment.
 setenv =
     spawn_pipe:     WEXPECT_SPAWN_CLASS=SpawnPipe
     legacy_wexpect: WEXPECT_SPAWN_CLASS=legacy_wexpect
+    
 commands =
+    # install the dependencies:
     pip install .[test]
+    
+    # Run the test itself
     coverage run -m unittest
+    
+    # Dump coverage summary to console
     coverage report --omit tests/*
-    coverage xml --omit tests/*
+    
+    # Convert coverage report to standard xml formula the filename includes the tox environment name
+    # https://tox.readthedocs.io/en/latest/config.html#environment-variable-substitutions
+    coverage xml --omit tests/* -o {env:TOX_ENV_NAME}_coverage.xml