Don't run all of the doctests twice
Merge pull request #1505 from mdboom/testing/pytest-2.4.0-part2

Don't run all of the doctests twice