issue6291: make FBTests for issues 5655 and 6116 work