Another fix for oldfashioned testsuite