Running `./setup.py test` works again
Merge pull request #498 from geigerzaehler/master

Running `./setup.py test` works again