Use unittest2.skip to better keep track of skipped tests