Fix failing test in master
Fix failing test in master

Failure was a result of merge of two related MRs that didn't account for
each other.

gitlabhq/omnibus-gitlab,gitlabhq/omnibus-gitlab,gitlabhq/omnibus-gitlab,gitlabhq/omnibus-gitlab