Fix integration tests (#13641)

Change-Id: I43978ded4b49ae218585db8b47b52b9d16172bcb