Cherry pick from 8d6bd5974e: Fixed tests browser