Unreviewed test gardening after r243229.