Fix test failures

http://jenkins.saltstack.com/job/salt-rs-rhel5/1511/
Merge pull request #10108 from terminalmage/tests

Fix test failures