Fixes #517
Merge pull request #541 from philipn/test_versioning_off

Fixes #517