Avoid WebTestOfUpgradeDatabase failures