diff --git a/.gitignore b/.gitignore
index 22536d615ef5f609aee5579d2b5881711b1ee0cb..61aa6cfe90448c1155227324a785c1dd12b78e7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 /persistent
 /runtime
 bootstrap.json
+.cache
+.coverage
+coverage.xml
diff --git a/.travis.yml b/.travis.yml
index 2b74ab1fd53b610a922d56e709eb8332add10d96..47f54760e8f7d447e9a1b20dd57b180e6fada7dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ python:
 - '2.7'
 - '3.3'
 install:
-  - pip install coverage coveralls
+  - pip install pytest pytest-cov coverage coveralls
   - pip install -r requirements.txt
-script:
-  - nosetests --with-coverage -vv -exe test/unit_tests
+script:   # Add pytest-pep8 when ready, leaving out for the moment
+  - PYTHONPATH=. py.test --cov=api --cov-report=term-missing test/unit_tests/
+after_success:
+  - coveralls