This currently only makes a difference in some skipped tests. Change-Id: Ia27fb1cf1bbf2ffdcc471eb6e4dacf4dce44efec