Another place where we circumvent tests issues