Make fixtures 'future proof'