Yes, that's what I was thinking. Create a new class that inherits from ``unittest.TestCase`` and have all our tests inherits from it instead of ``TestCase``. It is indeed a big change, but no bigger than the current changeset as you would need to change only classes that inherit from ``TestCase``.