diff --git a/.coveragerc b/.coveragerc
index 37410a36771566bf4fec216794a37fdfd2b3c3ea..a1271a94fca4052868e114ba82b9a8b55555e2ad 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,13 @@
+# -*- conf -*-
 # .coveragerc to control coverage.py
 [run]
 branch = True
+source = lib
+omit =
+     lib/spack/spack/test/*
+     lib/spack/env/*
+     lib/spack/docs/*
+     lib/spack/external/*
 
 [report]
 # Regexes for lines to exclude from consideration
diff --git a/.travis.yml b/.travis.yml
index 30dfebf783e8cebd5788ebad713504af2f1ef0d7..4ff4d5f4833acebd66f0ad0be09a23fd1ce0139a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,9 @@ script:
   - spack config get compilers
   - spack install -v libdwarf
   # Run unit tests with code coverage
-  - coverage run --source=lib --omit=lib/spack/spack/test/*,lib/spack/env/*,lib/spack/docs/*,lib/spack/external/* bin/spack test
+  - coverage run bin/spack test
   # Checks if the file that have been changed are flake8 conformant
-  - CHANGED_PYTHON_FILES=`git diff develop... --name-only | perl -ne 'print if /\.py/g'`
+  - CHANGED_PYTHON_FILES=`git diff develop... --name-only | perl -ne 'print if /\.py$/'`
   - if [[ ${CHANGED_PYTHON_FILES} ]] ; then flake8 --format pylint --config flake8.ini ${CHANGED_PYTHON_FILES} ; fi