Merge "Skip amphora scenario test if provider is not set"