Fix running of old style integration tests