Fix stable integration tests

Change-Id: I7def2163b8e2064a7af4f0f53861ae3e7aec1e9c