Resolves issues with test execution via os-testr. Change-Id: I03b49c8b13c8d9031651dbfd1984d1bda75476c7