Make staging test less flaky