Another attempt to make the tests run on Jenkins

Change-Id: I880af722a710bc4be92cedb456dd13623597fe7d