The best thing would be converting them to unittest (if there aren't already unittests for that).

A general comment about these patches: I think it would be better to remove test_main() (and related unnecessary code) with unittest.main().  One of the advantage of doing it now is that you can simply test discovery by doing ./python Lib/test/test_foo.py.

This is currently being discussed on #16748, but I think we pretty much agree on this.