Make tests compatible with pytest 2.4.0
Merge pull request #1503 from mdboom/testing/pytest-2.4.0

Make tests compatible with pytest 2.4.0