Use same upgrade-test as firefly.

The changes for firefly upgrade tests apply to giant as well.