Removing os specific logic from tests
Merge pull request #4685 from danmcp/master

Merged by openshift-bot