Fix upgrade tests
Merge pull request #4243 from pmorie/dev/fix-tests

Merged by openshift-bot