Fixing tests
Merge pull request #4836 from danmcp/master

Merged by openshift-bot