Fixing runtime tests
Merge pull request #2996 from danmcp/master

Merged by openshift-bot