Merge pull request #1683 from alex/only-run-local-tests

Tell py.test to only run the tests from the local tests dir.