Fix spec in master
Fixes failed builds such as https://gitlab.com/gitlab-org/gitlab-ce/builds/3919501
cherry-picked from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6291
Fixes failed builds such as https://gitlab.com/gitlab-org/gitlab-ce/builds/3919501
cherry-picked from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6291