diff --git a/.travis.yml b/.travis.yml
index 005b2b0..5a35c20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,19 +15,22 @@ install:
   - time sudo apt-get install -qq python${PYTHON_SUFFIX}-numpy python${PYTHON_SUFFIX}-sphinx python${PYTHON_SUFFIX}-nose python${PYTHON_SUFFIX}-numexpr
   - pip install numexpr
   - pip install coveralls
+  - pip install pytest
   - pip install pytest-cov
+  - pip install pytest-pep8
   # Install a ROOT binary that we custom-built in a 64-bit Ubuntu VM
   # for the correct Python / ROOT version
   - time wget --no-check-certificate https://dl.dropbox.com/u/4923986/rootpy/64/root_v${ROOT}_Python_${TRAVIS_PYTHON_VERSION}.tar.gz
   - time tar zxf root_v${ROOT}_Python_${TRAVIS_PYTHON_VERSION}.tar.gz
   - source root_v${ROOT}_Python_${TRAVIS_PYTHON_VERSION}/bin/thisroot.sh
-
+before_script:
+  - py.test --cov=bad
 script:
 
   # Check if root and PyROOT work ok
   - time root -l -b -q
   - time python -c 'import ROOT; ROOT.TBrowser()'
-  - coverage run --source=bad setup.py test
+  - py.test tests -v --cov bad --cov-report term-missing
 
 after_success:
     - coveralls
\ No newline at end of file