Modify test to handle both cases.
Handle that dichotomy in the mailman .objects method, too.