Apply fix from 3b10868 to users tests too

Repeat after me "I'll run a full test suite before pushing changes"