Made the testsuite running (with failures+errors) on 1.6.