Fix scoping issues with Spinach tests (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/14929499)