@ogrisel I think we should add this on the long run. Needed it to make sure I don't destroy critical tests.