RFPL-3195: stabilizing skin tests