PIM-3095: Make specs work