Fix failing socket file tests
Merge pull request #1146 from pmorie/bugs/fix-tests2

Merged by openshift-bot