Merge #10423: [tests] skipped tests should clean up after themselves