Fix unit tests for RHEL

Fixes bug 1158609
Fixes bug 1158612

Change-Id: I5ee6214a935cfa663c96b1ba6893f265890c4202