Backport Guido's checkin 1.3:

Should raise TestSkipped, not ImportError, when deciding to skip the
test.