diff --git a/.travis.yml b/.travis.yml
index d7bdf9b2cacb634bdb699ed2b2ad2adbe89e9d96..60b3b1cc31a53230e1e33780f2f2e6424ba8e8a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,7 +92,7 @@ before_script:
 script: share/spack/qa/run-$TEST_SUITE-tests
 
 after_success:
-  - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 && $TRAVIS_OS_NAME == "linux" ]]; then codecov --env PY_VERSION; fi
+  - codecov --env PY_VERSION
 
 #=============================================================================
 # Notifications
diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests
index d2ce9647aff560147f33a28c7d0e0d2fdb9e3e67..c266665ccb2ab34b47dd2a3a34387e837f8297ae 100755
--- a/share/spack/qa/run-unit-tests
+++ b/share/spack/qa/run-unit-tests
@@ -42,7 +42,9 @@ spack compilers
 spack config get compilers
 
 # Run unit tests with code coverage
-if [[ "$TRAVIS_PYTHON_VERSION" == 2.7 ]]; then
+py_ver=$(python -c 'import platform; print(platform.python_version())')
+if [[ "$py_ver" == 2.7* || "$py_ver" == 3.6* ]];
+then
     coverage run bin/spack install -v libdwarf
     coverage run bin/spack test "$@" && coverage combine
 else