Merge pull request #199 from mchf/master

Another fix for oldfashioned testsuite