#548 integration test stabilized