Fix for changed confest.py discovery in py.test 2.6.3

See: https://mail.python.org/pipermail/pytest-dev/2014-September/002617.html