Make integration tests more resilient