Slightly better test runner for jenkins

Change-Id: I8a28dfa9f65571a1e7ad2f165ccbc27e78c194bc
Merge "Slightly better test runner for jenkins"