Make test -k happy on pytest 2.4
Merge branch 'master' into readlength-666