Revert "[ticket/12099] Fix test - use proper vars"

This reverts commit dc0d30903591bba7f0f5e30e4857bbd9a04ef5a9.