I'm happy with this approach (hopefully it will be short-lived too) but do wonder if we should reuse our xfail approach, such as xfail_panda. Just a thought.